This commit was manufactured by cvs2svn to create tag 'R3_0_1'.
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
index 07ba2fa..3855d52 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core; singleton:=true
-Bundle-Version: 1.0.306.qualifier
+Bundle-Version: 1.0.305.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.properties
index 84585ca..5aaaa02 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.properties
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.properties
@@ -24,13 +24,13 @@
!-- Service.RuntimeId - ID of web service runtime
Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.60
+Service.ServerId=org.eclipse.jst.server.tomcat.50
!-- Service.TypeId - Java Bean is default for both Top Down and Bottom Up
!-- Service.TypeId=Java Bean
!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service EAR project - this property can be used to give the service EAR project a different name than the EAR project already associated with the service project. type: String
+!-- ServiceEarProjectName - !--type:String - name of Service project - this property can be used to give the service EAR project a different name than the project containing the initial selection. type: String
!--ServiceEarProjectName=serviceEarProjectName
!-- Mappings
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.properties
index 52e5de0..9095f6c 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.properties
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.properties
@@ -25,7 +25,7 @@
!--Client.RuntimeId - ID of web service runtime
Client.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
!--Client.ServerId - ID of target server
-Client.ServerId=org.eclipse.jst.server.tomcat.60
+Client.ServerId=org.eclipse.jst.server.tomcat.50
!--ClientProjectName - name of Client project - this property can be used to give the client project a
!-- different name than the project containing the initial selection
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.properties
index 7cbd308..a610d10 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.properties
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.properties
@@ -24,13 +24,13 @@
!-- Service.RuntimeId - ID of web service runtime
Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.60
+Service.ServerId=org.eclipse.jst.server.tomcat.50
!-- Service.TypeId - Java Bean is default for both Top Down and Bottom Up
!-- Service.TypeId=Java Bean
!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service EAR project - this property can be used to give the service EAR project a different name than the EAR project already associated with the service project. type: String
+!-- ServiceEarProjectName - !--type:String - name of Service project - this property can be used to give the service EAR project a different name than the project containing the initial selection. type: String
!--ServiceEarProjectName=serviceEarProjectName
!-- Mappings
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
index f30804c..ef9ed3e 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.ui; singleton:=true
-Bundle-Version: 1.0.305.qualifier
+Bundle-Version: 1.0.304.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
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 bad11ef..25cdd31 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
@@ -10,7 +10,6 @@
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
* 20080616 235648 makandre@ca.ibm.com - Andrew Mak, Errors in client proxy if using default namespace to package mapping
- * 20080917 247561 mahutch@ca.ibm.com - Mark Hutchinson, Error if whitespace entered in mapping page
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
@@ -109,7 +108,7 @@
HashMap map = new HashMap();
for (int i=0; i<pairs.length; i++)
{
- map.put(pairs[i].getText(0).trim(),pairs[i].getText(1).trim());
+ map.put(pairs[i].getText(0),pairs[i].getText(1));
}
javaParameter_.setMappings(map);
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
index d9cf385..860968d 100644
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 1.0.306.qualifier
+Bundle-Version: 1.0.305.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
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 6881735..8356366 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
@@ -20,7 +20,6 @@
* 20060810 135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor
* 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
* 20080227 119964 trungha@ca.ibm.com - Trung Ha
- * 20081111 252062 mahutch@ca.ibm.com - Mark Hutchinson, Don't depend on AutoBuild to compile bean
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
@@ -49,9 +48,9 @@
import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildBeanCommand;
import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
+import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
import org.eclipse.wst.command.internal.env.core.ICommandFactory;
import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
@@ -105,8 +104,7 @@
// commands.add(new SimpleFragment( "AxisServiceBeanMapping" ));
commands.add(new BUConfigCommand());
commands.add(new ValidateWSIComplianceCommand());
- //commands.add(new WaitForAutoBuildCommand());
- commands.add(new BuildBeanCommand());
+ commands.add(new WaitForAutoBuildCommand());
commands.add(new BUCodeGenOperation());
// commands.add(new RefreshProjectCommand());
commands.add(new BuildProjectCommand());
@@ -212,9 +210,6 @@
//UpdateWEBXMLCommand
registry.addMapping(BUAxisInputCommand.class, "ServerProject", BUCodeGenOperation.class, "ServiceProject", new StringToIProjectTransformer());
- //BuildBeanCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildBeanCommand.class, "Project", new StringToIProjectTransformer());
-
//BuildProjectCommand
registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
index 29c079c..d6f4547 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
@@ -5,4 +5,3 @@
@dot
src.zip
javaCompiler...args
-org.eclipse.jst.ws.consumption.ui_*.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
index 387afdd..cb700d3 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
-Bundle-Version: 1.1.4.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java
index a28667f..bba32af 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java
@@ -66,8 +66,8 @@
for (int i=0; i < allEarComps.length; i++)
{
IProject earProject = allEarComps[i].getProject();
- boolean canAssociate = J2EEUtils.canAssociateProjectToEARWithoutWarning(proj, earProject);
- if (canAssociate)
+ IStatus associationStatus = J2EEUtils.canAssociateProjectToEAR(proj, earProject);
+ if (associationStatus.getSeverity()==IStatus.OK)
{
return allEarComps[i].getName();
}
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 eabb009..d9fea68 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
@@ -26,7 +26,6 @@
* 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
* 20080417 227599 kathy@ca.ibm.com - Kathy Chan
* 20080717 241283 ericdp@ca.ibm.com - Eric D. Peters, Class version error when invoking sample JSP on Tomcat 5.5 when Java project is Java 6
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.common;
@@ -53,7 +52,6 @@
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.EARValidationMessageResourceHandler;
import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
@@ -443,13 +441,20 @@
if (project.exists() && ep.exists()) {
if (!J2EEUtils.isComponentAssociated(ep, project)) {
- boolean associateStatus = J2EEUtils.canAssociateProjectToEARWithoutWarning(project, ep);
-
- if (!associateStatus) {
- return StatusUtils.warningStatus(NLS.bind(
- EARValidationMessageResourceHandler.MESSAGE_INCOMPATIBLE_SPEC_WARNING_,
+ IStatus associateStatus = J2EEUtils.canAssociateProjectToEAR(project, ep);
+ if (associateStatus.getSeverity() == IStatus.ERROR) {
+ if (isClient) {
+ return StatusUtils.errorStatus(NLS.bind(
+ ConsumptionUIMessages.MSG_CLIENT_CANNOT_ASSOCIATE,
new String[] { projectName, ep.getName(),
- }));
+ associateStatus.getMessage() }));
+ } else {
+ return StatusUtils.errorStatus(NLS.bind(
+ ConsumptionUIMessages.MSG_SERVICE_CANNOT_ASSOCIATE,
+ new String[] { projectName, ep.getName(),
+ associateStatus.getMessage() }));
+ }
+
}
}
}
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 db2cc0c..1e7ac9d 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
@@ -17,7 +17,6 @@
* 20070403 173654 kathy@ca.ibm.com - Kathy Chan
* 20080326 221364 kathy@ca.ibm.com - Kathy Chan
* 20080724 241275 pmoogk@ca.ibm.com - Peter Moogk, Validate WSDL before doing major Web service processing.
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.extension;
@@ -156,7 +155,6 @@
command.setRequiredFacetVersions(rfv);
command.setServerFactoryId(typeRuntimeServer_.getServerId());
command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- command.setEarProjectName(earProject_);
status = command.execute( monitor, adaptable );
if (status.getSeverity() == Status.ERROR)
{
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
index 9e6eaa8..e08f197 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
@@ -10,7 +10,6 @@
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
* 20080415 227152 makandre@ca.ibm.com - Andrew Mak, Need a way to specify a backup Web service runtime
- * 20080918 247537 mahutch@ca.ibm.com - Mark Hutchinson, Update default server runtime to Tomcat 6
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.preferences;
@@ -29,7 +28,7 @@
private String FALLBACK_RUNTIME = "FALLBACK_RUNTIME"; // Web service runtime to fallback to if preferred runtime is not suitable
//private String PREFERENCE_J2EE_VERSION = "PREFERENCE_J2EE_VERSION";
- private String SERVER_FACTORY_ID_DEFAULT = "org.eclipse.jst.server.tomcat.60";
+ private String SERVER_FACTORY_ID_DEFAULT = "org.eclipse.jst.server.tomcat.50";
private String RUNTIME_ID_DEFAULT = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
public PersistentServerRuntimeContext()
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 648f6b4..6836696 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
@@ -27,7 +27,6 @@
* 20061212 159911 makandre@ca.ibm.com - Andrew Mak, changing service definition resets some configuration fields
* 20060125 159911 kathy@ca.ibm.com - Kathy Chan, Remove unused method and imports
* 20080613 236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- * 20090926 248448 mahutch@ca.ibm.com - Mark Hutchinson, Should not resize WS Wizard for long WSDL file names
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets;
@@ -50,7 +49,6 @@
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
@@ -129,11 +127,6 @@
ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL,
INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL, SWT.LEFT | SWT.BORDER );
- Object layoutData = serviceImpl_.getLayoutData();
- if (layoutData instanceof GridData) {
- ((GridData)layoutData).widthHint = 225;
- }
-
objectModifyListener_ = new ModifyListener(){
public void modifyText(ModifyEvent e) {
if (serviceImpl_.getText().indexOf(':') > 0) {
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
index a8a3208..d1dac0f 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
@@ -15,7 +15,6 @@
* 20070410 181827 kathy@ca.ibm.com - Kathy Chan
* 20080220 219537 makandre@ca.ibm.com - Andrew Mak
* 20080501 229728 makandre@ca.ibm.com - Andrew Mak, uppercase .WSDL cannot be found by the Web Service Client wizard
- * 20081208 257618 mahutch@ca.ibm.com - Mark Hutchinson, Add Mechanism for Adopters to map Services to WSDL URLs
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets;
@@ -28,7 +27,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
@@ -38,7 +36,6 @@
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
import org.eclipse.wst.ws.internal.util.UniversalPathTransformer;
-import org.eclipse.wst.ws.internal.wsfinder.WSDLURLStringWrapper;
import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
@@ -65,13 +62,7 @@
{
uri_ = ifile.getFullPath().toString();
}
- }
- else if (Platform.getAdapterManager().hasAdapter(firstSel, WSDLURLStringWrapper.class.getName())) {
- Object adaptedObject = Platform.getAdapterManager().loadAdapter(firstSel, WSDLURLStringWrapper.class.getName());
- WSDLURLStringWrapper wrapper = (WSDLURLStringWrapper)adaptedObject;
- uri_ = wrapper.getWSDLURLString();
- }
- else if (firstSel instanceof ServiceImpl)
+ } else if (firstSel instanceof ServiceImpl)
{
ServiceImpl serviceImpl = (ServiceImpl)firstSel;
uri_ = J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
index 53bbfd6..205b7b2 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
@@ -17,7 +17,6 @@
* 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
* 20080409 219121 trungha@ca.ibm.com - Trung Ha
* 20080729 241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- * 20081028 248625 ericdp@ca.ibm.com - Eric D. Peters, Exceptions running ANT tasks using inappropriate projects
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
@@ -425,24 +424,16 @@
}
//If the project exists, ensure it supports the Web service type, Web service runtime, and server.
if (getInitialProject() != null && getInitialProject().getName() != null && ProjectUtilities.getProject(getInitialProject().getName()).exists()) {
- ValidationUtils valUtils = new ValidationUtils();
-
if (WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP &&
FacetUtils.isJavaProject(getInitialProject())){
+ ValidationUtils valUtils = new ValidationUtils();
if(!valUtils.doesServerSupportProject(serverId,getInitialProject().getName())){
status = StatusUtils.errorStatus(NLS.bind(
ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT,
new String[] { WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId), getInitialProject().getName() }));
env.getStatusHandler().reportError(status);
}
- }
- if (!valUtils.doesServerSupportProject(serverId, serviceProjectName_)) {
- status = StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT,
- new String[] { WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId),
- serviceProjectName_ }));
- env.getStatusHandler().reportError(status);
- }
+ }
}
// Determine if the selected server type has only stub runtimes associated
// with it and if a server instance is not selected.
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 4fcc06f..eff1617 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
* 20070116 159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
* 20070327 172339 kathy@ca.ibm.com - Kathy Chan
* 20070713 191357 kathy@ca.ibm.com - Kathy Chan
- * 20081208 257618 mahutch@ca.ibm.com - Mark Hutchinson, Add Mechanism for Adopters to map Services to WSDL URLs
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
@@ -21,7 +20,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -34,7 +32,6 @@
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.wst.command.internal.env.core.data.Transformer;
import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.ws.internal.wsfinder.WSDLURLStringWrapper;
import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
@@ -58,11 +55,6 @@
{
}
}
- else if (Platform.getAdapterManager().hasAdapter(sel, WSDLURLStringWrapper.class.getName())) {
- Object adaptedObject = Platform.getAdapterManager().loadAdapter(sel, WSDLURLStringWrapper.class.getName());
- WSDLURLStringWrapper wrapper = (WSDLURLStringWrapper)adaptedObject;
- return new StructuredSelection(wrapper.getWSDLURLString());
- }
else if (sel instanceof ServiceImpl)
{
return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)sel));
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 e9fe9d6..b6e37e3 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
@@ -1416,8 +1416,8 @@
IProject earProject = ProjectUtilities.getProject(earProjectName);
if (!clientProject.exists() && serviceProject.exists())
{
- boolean canAssociate = J2EEUtils.canAssociateProjectToEARWithoutWarning(serviceProject, earProject);
- goodJ2EELevel = (canAssociate);
+ IStatus associationStatus = J2EEUtils.canAssociateProjectToEAR(serviceProject, earProject);
+ goodJ2EELevel = (associationStatus.getSeverity() == IStatus.OK);
}
}
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 0053910..1fff768 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
@@ -21,7 +21,6 @@
* 20060829 180833 ericdp@ca.ibm.com - Eric D. Peters, New Web Service wizard service settings dialog has unlabelled enabled text fields
* 20080409 226047 kathy@ca.ibm.com - Kathy Chan
* 20080428 224726 pmoogk@ca.ibm.com - Peter Moogk
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
@@ -29,7 +28,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.EARValidationMessageResourceHandler;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.jst.ws.internal.common.ResourceUtils;
import org.eclipse.jst.ws.internal.common.ServerUtils;
@@ -599,11 +597,17 @@
{
if (!J2EEUtils.isComponentAssociated(ep,p))
{
- boolean associateStatus = J2EEUtils.canAssociateProjectToEARWithoutWarning(p, ep);
- if (!associateStatus)
+ IStatus associateStatus = J2EEUtils.canAssociateProjectToEAR(p, ep);
+ if (associateStatus.getSeverity() == IStatus.ERROR)
{
- return StatusUtils.warningStatus( NLS.bind(EARValidationMessageResourceHandler.MESSAGE_INCOMPATIBLE_SPEC_WARNING_, new String[]{p.getName(), ep.getName(), } ) );
-
+ if (isClient_)
+ {
+ return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_CANNOT_ASSOCIATE, new String[]{p.getName(), ep.getName(), associateStatus.getMessage()} ) );
+ }
+ else
+ {
+ return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_CANNOT_ASSOCIATE, new String[]{p.getName(), ep.getName(), associateStatus.getMessage()} ) );
+ }
}
}
}
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 0098457..fd9f936 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
@@ -19,7 +19,6 @@
* 20080616 237298 gilberta@ca.ibm.com - Gilbert Andrews
* 20080619 237797 gilberta@ca.ibm.com - Gilbert Andrews
* 20080723 241303 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080808 243602 rkklai@ca.ibm.com - Raymond Lai, fix NPE when changing runtime (the server combo)
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
@@ -415,7 +414,7 @@
for(int j =0; j<servers.length;j++){
String id = runtimes_.getId(selection);
if(id.equals(servers[j].getRuntime().getId())){
- serverInstances_.add(servers[j].getId(), servers[j].getName());
+ serverInstances_.add(servers[j].getRuntime().getId(), servers[j].getName());
serverInstanceTypeCombo_.add(servers[j].getName());
}
}
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 c604bf8..5297975 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
@@ -16,7 +16,6 @@
* 20080211 117924 trungha@ca.ibm.com - Trung Ha
* 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
* 20080527 234169 gilberta@ca.ibm.com - Gilbert Andrews
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
@@ -73,16 +72,6 @@
//1. Create a Web project for the sample if one does not already exist.
sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
boolean createdSampleProject = false;
- ValidationUtils vu = new ValidationUtils();
- boolean serverNeedsEAR = vu.serverNeedsEAR(testInfo.getClientServerTypeID());
- if (serverNeedsEAR) {
- if (testInfo.getClientEARProject() == null
- || testInfo.getClientEARProject().length() == 0) {
- sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;
- } else {
- sampleEARProject = testInfo.getClientEARProject();
- }
- }
if (!sampleIProject.exists())
{
CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
@@ -93,7 +82,6 @@
command.setRequiredFacetVersions(new RequiredFacetVersion[0]);
command.setServerFactoryId(testInfo.getClientServerTypeID());
command.setServerInstanceId(testInfo.getClientExistingServer().getId());
- command.setEarProjectName(sampleEARProject);
IStatus status = command.execute( monitor, adaptable );
if (status.getSeverity() == Status.ERROR)
{
@@ -105,7 +93,15 @@
//2. If the selected server requires an EAR and no EAR name
//has been provided, choose an EAR name and create it if it doesn't exist.
+ ValidationUtils vu = new ValidationUtils();
+ boolean serverNeedsEAR = vu.serverNeedsEAR(testInfo.getClientServerTypeID());
if (serverNeedsEAR) {
+ if (testInfo.getClientEARProject() == null
+ || testInfo.getClientEARProject().length() == 0) {
+ sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;
+ } else {
+ sampleEARProject = testInfo.getClientEARProject();
+ }
sampleEARIProject = ProjectUtilities.getProject(sampleEARProject);
if (sampleEARIProject == null || !sampleEARIProject.exists())
{
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
index 3243101..293d9f4 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,10 +9,9 @@
* IBM Corporation - initial API and implementation
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner (initial creation)
+ * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner (initial creation)
* 20060426 138051 kathy@ca.ibm.com - Kathy Chan
* 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080923 247525 mahutch@ca.ibm.com - Mark Hutchinson, cache not updated properly when project facet versions changed
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
@@ -43,7 +42,7 @@
* and clientRuntimes.
*
* <br/><br/>
- * Terminology used in the javadoc in this class:
+ * Teminology used in the javadoc in this class:
* <ul>
* <li><b>serviceRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.serviceRuntimes.
* The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor</li>
@@ -302,7 +301,7 @@
rfvs = desc.getRequiredFacetVersions();
}
- Set facetVersions = new HashSet(FacetUtils.getFacetsForProject(projectName));
+ Set facetVersions = FacetUtils.getFacetsForProject(projectName);
if (facetVersions == null)
{
fm = new FacetMatcher();
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 d634ef5..617080b 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
@@ -19,7 +19,6 @@
* 20080326 221364 kathy@ca.ibm.com - Kathy Chan
* 20080402 225378 makandre@ca.ibm.com - Andrew Mak, Client wizard runtime/server defaulting is not respecting the preference
* 20080530 234871 makandre@ca.ibm.com - Andrew Mak, Workbench has not been created yet error in cmdline Ant
- * 20080808 243623 mahutch@ca.ibm.com - Mark Hutchinson, Improve server defaulting performance
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
@@ -883,39 +882,29 @@
/**
* Returns the id of a server type that supports the given Web service client type.
* Returns the server type ID from the preference if it supports the typeId.
- *
+ *
* @param typeId The client type ID.
*
* @return String id of a id of a server type that supports the given Web service client type.
* Returns null if such a server type cannot be found.
*/
- public static String getDefaultClientServerValueFor(String typeId) {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
- String first = null;//the first server found
- String[] crts = getClientRuntimesByType(typeId);
-
- if (crts != null)
- {
- for (int i = 0; i < crts.length; i++)
- {
- //Get the runtimes that work for the facets required for this serviceRuntime
- String[] fIds = getServerFactoryIdsByClientRuntime(crts[i]);
- for (int j=0; j<fIds.length; j++)
- {
- if (first == null) {
- first = fIds[j];
- }
- if (preferredServerFactoryId.equals(fIds[j])) {
- return fIds[j];//found the preferred one, stop searching and return it
- }
- }
- }
- }
- return first;
+ public static String getDefaultClientServerValueFor(String typeId)
+ {
+ String[] fIds = getServerFactoryIdsByClientType(typeId);
+ if (fIds==null || fIds.length==0)
+ return null;
+
+ PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
+ String preferredServerFactoryId = context.getServerFactoryId();
+ for (int i = 0; i < fIds.length; i++) {
+ String serverTypeId = fIds[i];
+ if (serverTypeId.equals(preferredServerFactoryId)) {
+ return serverTypeId;
+ }
+ }
+ return fIds[0];
}
-
/**
* Returns whether or not the given combination of server type, Web service runtime, and Web service type is
* supported. Used for validation.
diff --git a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
index e954c8b..72ec36f 100644
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
-Bundle-Version: 1.0.307.qualifier
+Bundle-Version: 1.0.305.qualifier
Bundle-ClassPath: wsc.jar,
webserviceutils.jar
Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin
@@ -60,4 +60,3 @@
org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.consumption/build.properties b/bundles/org.eclipse.jst.ws.consumption/build.properties
index 5bb9bda..fc60e98 100644
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ b/bundles/org.eclipse.jst.ws.consumption/build.properties
@@ -21,7 +21,4 @@
webserviceutils.jar,\
META-INF/,\
about.html
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=256033
-# jars.extra.classpath = ../javax.xml.soap/lib/saaj.jar
-extra.javax.xml.soap=platform:/plugins/javax.xml.soap/lib/saaj.jar
-
+jars.extra.classpath = ../javax.xml.soap/lib/saaj.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildBeanCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildBeanCommand.java
deleted file mode 100644
index f04f119..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildBeanCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20081111 252062 mahutch@ca.ibm.com - Mark Hutchinson, Don't depend on AutoBuild to compile bean
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class BuildBeanCommand extends AbstractDataModelOperation {
-
- private IProject project_;
-
- /*
- * This Command builds the service project, and all projects it references. This is different from the
- * BuildProjectCommand which only builds the service project
- */
- public BuildBeanCommand() {
- //default constructor
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IProject[] referencedProjects;
-
- try {
- referencedProjects = project_.getReferencedProjects();
- for (int i = 0; i < referencedProjects.length; i++) {
- referencedProjects[i].build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
- }
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
-
- } catch (Exception e) {
- return StatusUtils.errorStatus(e);
- }
- return Status.OK_STATUS;
- }
-
-
- /**
- * @param project the service project to be built.
- */
- public void setProject(IProject project) {
- this.project_ = project;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
index e688e63..f0ff802 100644
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
+++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
@@ -20,7 +20,6 @@
* 20080305 220371 kathy@ca.ibm.com - Kathy Chan
* 20080305 220371 kathy@ca.ibm.com - Kathy Chan - reverting previous change to 220371
* 20080326 220371 kathy@ca.ibm.com - Kathy Chan - re-applying 220371
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.command.common;
@@ -37,7 +36,6 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.jst.ws.internal.common.ServerUtils;
import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
@@ -46,11 +44,8 @@
import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.eclipse.wst.server.core.IRuntime;
@@ -64,9 +59,6 @@
//name of the project to be created
private String projectName;
- //name of the EAR project associated with projectName
- private String earProjectName;
-
//id of the IFacetedProjectTemplate to be used to create this project.
private String templateId;
@@ -207,8 +199,8 @@
/**
* Returns the set of facets to install on the new project. The set will consist
- * of the highest version of each of the template's fixed facets that satisfies
- * the required facet versions, the facet runtime, and the EAR project J2EE level.
+ * of the highest version of each of the template's fixed facets that satifies
+ * both the required facet versions and the facet runtime.
* @return Set a Set containing elements of type IProjectFacetVersion.
*/
private Set getFacetsToAdd()
@@ -225,14 +217,14 @@
//Walk the facet version combinations in order of descending version numbers.
for (int i=n-1; i>=0; i--)
{
- //Check this template combination to see if it is compatible with the
- //required facet versions, the server runtime, and the EAR. If it is, choose it.
+ //Check this template combination to see if it is compatible with both the
+ //required facet versions and the server runtime. If it is, choose it.
Set combination = allCombinations[i];
FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combination);
if (fm.isMatch())
{
- //Check against Runtime & EAR
- if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, combination) && doesEARSupportFacets(combination) )
+ //Check against Runtime
+ if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, combination))
{
//We have a match. Use this combination of facet versions for project creation.
facets = combination;
@@ -260,10 +252,10 @@
}
//Unlikely to get to this point in the code, but if we do, choose the highest version
- //of each fixed facet in the template that is supported by the server runtime
+ //of each fixed facet in the template.
if (facets == null)
{
- facets = getHighestFacetVersionsFromTemplateAndServer();
+ facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
}
return facets;
@@ -336,101 +328,8 @@
{
this.serverInstanceId = serverInstanceId;
}
- public void setEarProjectName(String earProject) {
- this.earProjectName = earProject;
- }
+
- private RequiredFacetVersion[] getRequiredWebFacets() {
- return new RequiredFacetVersion[] { getRequiredFacetVersion(
- IModuleConstants.JST_WEB_MODULE,
- J2EEUtils.getWebJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
- }
+
- private RequiredFacetVersion[] getRequiredAppClientFacets() {
- return new RequiredFacetVersion[] { getRequiredFacetVersion(
- IModuleConstants.JST_APPCLIENT_MODULE,
- J2EEUtils.getAppClientJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
- }
-
- private RequiredFacetVersion[] getRequiredEJBFacets() {
- return new RequiredFacetVersion[] { getRequiredFacetVersion(
- IModuleConstants.JST_EJB_MODULE,
- J2EEUtils.getEJBJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
- }
-
- private boolean doesEARSupportFacets(Set combination) {
- try {
-
- if (earProjectName == null || earProjectName.length() == 0
- || !ProjectUtilities.getProject(earProjectName).exists())
- // the ear does not exist or the project type template is
- // undefined
- return true;
- else {
- if (combinationContainsFacet(combination, IModuleConstants.JST_WEB_MODULE))
- return FacetUtils
- .match(getRequiredWebFacets(), combination)
- .isMatch();
- else if (combinationContainsFacet(combination, IModuleConstants.JST_EJB_MODULE))
- return FacetUtils
- .match(getRequiredEJBFacets(), combination)
- .isMatch();
- else if (combinationContainsFacet(combination, IModuleConstants.JST_APPCLIENT_MODULE))
- return FacetUtils.match(getRequiredAppClientFacets(),
- combination).isMatch();
- else
- return true;
- }
- } catch (Exception e) {
- return true;
- }
- }
-
- private boolean combinationContainsFacet(Set combination, String facetName) {
- if (combination == null || facetName == null || facetName.length() == 0)
- return false;
- for (Iterator iter = combination.iterator(); iter.hasNext();) {
- IProjectFacetVersion nextFacetVersion = (IProjectFacetVersion) iter.next();
- if (facetName.equals(nextFacetVersion.getProjectFacet().getId()))
- return true;
- }
- return false;
- }
-
- private RequiredFacetVersion getRequiredFacetVersion(String facetName,
- String facetVersion) {
- IProjectFacet projectFacet = ProjectFacetsManager
- .getProjectFacet(facetName);
- IProjectFacetVersion projFacetVersion = projectFacet
- .getVersion(facetVersion);
- RequiredFacetVersion reqFacetVersion = new RequiredFacetVersion();
- reqFacetVersion.setAllowNewer(false);
- reqFacetVersion.setProjectFacetVersion(projFacetVersion);
- return reqFacetVersion;
- }
-
- private Set getHighestFacetVersionsFromTemplateAndServer()
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set fixedFacets = template.getFixedProjectFacets();
- HashSet initial = new HashSet();
- for (Iterator itr = fixedFacets.iterator(); itr.hasNext(); )
- {
- IProjectFacet facet = (IProjectFacet) itr.next();
- IProjectFacetVersion highestFacetVersion = null;
- try {
- highestFacetVersion = facet.getLatestSupportedVersion(facetRuntime);
- } catch (CoreException e) {
- try {
- highestFacetVersion = facet.getLatestVersion();
- } catch (CoreException e2) {
- //not much we can do here
- }
-
- }
- initial.add(highestFacetVersion);
- }
-
- return initial;
- }
}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
index b91f7be..a857509 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
-Bundle-Version: 1.0.307.qualifier
+Bundle-Version: 1.0.306.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
index 58aa105..a5ce213 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
+++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
@@ -17,7 +17,6 @@
* 20061011 159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
* 20070501 178129 makandre@ca.ibm.com - Andrew Mak, workspace reports "crash detected" after running WS ant task (cmdline)
* 20080729 241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- * 20080925 242312 ericdp@ca.ibm.com - Eric D. Peters, Cannot create BUJB WS from Bean in Java project using ANT tasks
*******************************************************************************/
package org.eclipse.jst.ws.internal.creation.ui.ant;
@@ -126,7 +125,6 @@
// Map ServerExtensionDefaultingCommand
dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null);
// Setup the PreServiceDevelopCommand.
dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class);
@@ -136,7 +134,6 @@
dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class );
dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class );
dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class );
dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
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 1c6dd34..a882171 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
@@ -20,7 +20,6 @@
* 20071220 213640 kathy@ca.ibm.com - Kathy Chan
* 20080326 221364 kathy@ca.ibm.com - Kathy Chan
* 20080724 241275 pmoogk@ca.ibm.com - Peter Moogk, Validate WSDL before doing major Web service processing.
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
*******************************************************************************/
package org.eclipse.jst.ws.internal.creation.ui.extension;
@@ -187,7 +186,6 @@
command.setRequiredFacetVersions(rfv);
command.setServerFactoryId(typeRuntimeServer_.getServerId());
command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- command.setEarProjectName(earProject_);
status = command.execute( monitor, adaptable );
if (status.getSeverity() == Status.ERROR)
{
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 fcc1d3b..852a8de 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
@@ -58,7 +58,6 @@
* 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
* 20080417 227599 kathy@ca.ibm.com - Kathy Chan
* 20080613 236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- * 20090926 248448 mahutch@ca.ibm.com - Mark Hutchinson, Should not resize WS Wizard for long WSDL file names
*******************************************************************************/
package org.eclipse.jst.ws.internal.creation.ui.widgets;
@@ -395,8 +394,7 @@
serviceLabel_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
serviceImpl_ = new Text(typeComposite, SWT.LEFT | SWT.BORDER );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- griddata.widthHint = 225;
+ GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
serviceImpl_.setLayoutData( griddata );
serviceImpl_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
utils_.createInfoPop(serviceImpl_, INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL);
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 5b6d555..f9c7dbe 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
@@ -26,7 +26,6 @@
* 20080402 225032 makandre@ca.ibm.com - Andrew Mak
* 20080527 234226 kathy@ca.ibm.com - Kathy Chan
* 20080730 242611 zhang@ca.ibm.com - Peter Moogk
- * 20080925 242312 ericdp@ca.ibm.com - Eric D. Peters, Cannot create BUJB WS from Bean in Java project using ANT tasks
*******************************************************************************/
package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
@@ -117,23 +116,13 @@
{
//Set the serviceRuntime based on the runtime and server.
//If user set a service project use that as initial project otherwise default from initial selection.
- //(above is true for all scenarios except BUJ from Java Project- for BUJ from Java Project need to create a dependancy in downstream commands
- //between the initial project and the service project so don't use as the initial selection
if (serviceProjectName_ != null)
{
- IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
- //use the user provided service project to define the runtime triplet (if user provided service project is not valid for
- //the web service type, the runtime triplet will contain a suitable project if one exists)
- DefaultRuntimeTriplet drt = getDefaultRuntime(serviceProject, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
- if (!(WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(serviceIds_.getTypeId()) == WebServiceScenario.BOTTOMUP &&
- FacetUtils.isJavaProject(initialProject_))){
- //user set a service project, use as initial project
- //initialProject_ is the project where the selected object resides, set to be the service project for now for all scenarios except BUJ from Java Project (for
- //BUJ from Java Project need to create a dependancy in downstream commands between the initial project and the service project)
- initialProject_ = serviceProject;
- }
- serviceFacetMatcher_ = drt.getFacetMatcher();
- serviceProjectName_ = drt.getProjectName(); //a suitable service project for the web service type, or null if a suitable project does not exist
+ initialProject_ = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
+
+ DefaultRuntimeTriplet drt = getDefaultRuntime(initialProject_, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
+ serviceFacetMatcher_ = drt.getFacetMatcher();
+ serviceProjectName_ = drt.getProjectName();
serviceRuntimeId_ = drt.getRuntimeId();
if (serviceRuntimeId_ != null)
diff --git a/bundles/org.eclipse.jst.ws/.classpath b/bundles/org.eclipse.jst.ws/.classpath
index 304e861..ce73933 100644
--- a/bundles/org.eclipse.jst.ws/.classpath
+++ b/bundles/org.eclipse.jst.ws/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
index 4165159..ac5284f 100644
--- a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
@@ -1,21 +1,21 @@
-#Wed Oct 01 07:20:02 EDT 2008
+#Mon Jan 30 10:35:26 EST 2006
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=ignore
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
@@ -54,4 +54,4 @@
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
index 46c324f..ff0993d 100644
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws
-Bundle-Version: 1.0.307.qualifier
+Bundle-Version: 1.0.305.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.plugin.WebServicePlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
@@ -44,4 +44,4 @@
com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)"
Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
index b5dbfcd..76317c0 100644
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,8 +19,6 @@
* 20070123 216345 gilberta@ca.ibm.com - Gilbert Andrews
* 20080212 208795 ericdp@ca.ibm.com - Eric Peters, WS wizard framework should support EJB 3.0
* 20080229 218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20090114 261087 ericdp@ca.ibm.com - Eric D. Peters, No way to get meta-inf path for a project
*******************************************************************************/
package org.eclipse.jst.ws.internal.common;
@@ -67,7 +65,6 @@
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.model.IModelProvider;
import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.EarUtilities;
import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
@@ -1028,92 +1025,8 @@
}
}
- /**
- * Determines whether project can be associated with earProject safely.
- * @returns true if the project is a Web project, EJB project, or AppClient
- * project that can safely be associated with the EAR project.
- * Returns false if the project is a Web project,
- * EJB project, or AppClient project that cannot be associated safely with the EAR project, and
- * true if project is not recognized as a Web, EJB, or
- * AppClient project, and ture if earProject is not recognized as an EAR project.
- */
- public static boolean canAssociateProjectToEARWithoutWarning(IProject project, IProject earProject) {
- boolean toReturn = true;
- boolean isWeb = isWebComponent(project);
- boolean isEJB = isEJBComponent(project);
- boolean isAppClient = isAppClientComponent(project);
- boolean isEAR = isEARComponent(earProject);
- if ((isWeb || isEJB || isAppClient) && isEAR)
- {
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
-
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- String compareVersion;
- List<IProjectFacetVersion> supportedFacetVersionList = new ArrayList<IProjectFacetVersion>();
- if (isWeb)
- {
- IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
- IProjectFacetVersion webPfv = fProject.getInstalledVersion(webPf);
- supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, webPf);
- toReturn = false;
- for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
- IProjectFacetVersion next = supportedFacetVersion;
- compareVersion = webPfv.getVersionString();
- if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) {
- toReturn = true;
- break;
- }
- }
-
- }
- else if (isEJB)
- {
- IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
- IProjectFacetVersion ejbPfv = fProject.getInstalledVersion(ejbPf);
- supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, ejbPf);
- toReturn = false;
- for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
- IProjectFacetVersion next = supportedFacetVersion;
- compareVersion = ejbPfv.getVersionString();
- if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) {
- toReturn = true;
- break;
- }
- }
-
- }
- else if (isAppClient)
- {
- IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
- IProjectFacetVersion acPfv = fProject.getInstalledVersion(acPf);
- supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, acPf);
- toReturn = false;
- for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
- IProjectFacetVersion next = supportedFacetVersion;
- compareVersion = acPfv.getVersionString();
- if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) {
- toReturn = true;
- break;
- }
- }
-
- }
-
- } catch (Exception e)
- {
- //not much we can do here, return what we've calculated thus far
- }
- }
-
-
- return toReturn;
-
- }
- /**
+
+ /*
* Determines whether project can be associated with earProject.
* @returns IStatus of OK if the project is a Web project, EJB project, or AppClient
* project that can be associated with the EAR project.
@@ -1123,7 +1036,6 @@
* lowest J2EE level that this project requires on an EAR.
* Returns an IStatus with severity OK if project is not recognized as a Web, EJB, or
* AppClient project or if earProject is not recognized as an EAR project.
- * @deprecated use canAssociateProjectToEARWithoutWarning(IProject project, IProject earProject)
*/
public static IStatus canAssociateProjectToEAR(IProject project, IProject earProject)
{
@@ -1276,31 +1188,7 @@
}
return modulePath;
}
-
- /**
- * @param project
- * @return
- */
- public static IPath getMetaInfPath(IProject project){
-
- IVirtualComponent component = ComponentCore.createComponent(project);
-
- //should META-INF location be pulled in from the .component file rather than hardcoded here?
- IVirtualFolder metaInfDir = component.getRootFolder().getFolder(new Path("/META-INF"));
- IPath modulePath = metaInfDir.getWorkspaceRelativePath();
-
- if (!metaInfDir.exists())
- {
- try
- {
- metaInfDir.create(0,null);
- }
- catch (CoreException e)
- {}
- }
- return modulePath;
- }
-
+
/**
*
@@ -1647,67 +1535,5 @@
jm.join(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME, null);
}catch(Exception exc){}
}
- /**
- * Determines the IJ2EEModuleConstants.JST_WEB_MODULE facet version that
- * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
- * @returns the version String for IJ2EEModuleConstants.JST_WEB_MODULE facet, if there is problem
- * trying to determine the version, either the default version or the latest supported version
- * will be returned
- */
- public static String getWebJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
- String returnVersion = EarUtilities.DYNAMIC_WEB_FACET.getDefaultVersion().getVersionString();
- try {
- returnVersion = EarUtilities.DYNAMIC_WEB_FACET.getLatestVersion().getVersionString();
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
- returnVersion= EarUtilities.getSupportedFacets(earPfv, webPf).get(0).getVersionString();
- } catch (Exception e) {
- //nothing we can do here, return what we have calculated thus far
- }
- return returnVersion;
- }
- /**
- * Determines the IJ2EEModuleConstants.JST_APPCLIENT_MODULE facet version that
- * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
- * @returns the version String for IJ2EEModuleConstants.JST_APPCLIENT_MODULE facet, if there is problem
- * trying to determine the version, either the default version or the latest supported version
- * will be returned
- */
- public static String getAppClientJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
- String returnVersion = EarUtilities.APPLICATION_CLIENT_FACET.getDefaultVersion().getVersionString();
- try {
- returnVersion = EarUtilities.APPLICATION_CLIENT_FACET.getLatestVersion().getVersionString();
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
- returnVersion= EarUtilities.getSupportedFacets(earPfv, acPf).get(0).getVersionString();
- } catch (Exception e) {
- //nothing we can do here, return what we have calculated thus far
- }
- return returnVersion;
- }
- /**
- * Determines the IJ2EEModuleConstants.JST_EJB_MODULE facet version that
- * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
- * @returns the version String for IJ2EEModuleConstants.JST_EJB_MODULE facet, if there is problem
- * trying to determine the version, either the default version or the latest supported version
- * will be returned
- */
- public static String getEJBJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
- String returnVersion = EarUtilities.EJB_FACET.getDefaultVersion().getVersionString();
- try {
- returnVersion = EarUtilities.EJB_FACET.getLatestVersion().getVersionString();
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
- returnVersion= EarUtilities.getSupportedFacets(earPfv, ejbPf).get(0).getVersionString();
- } catch (Exception e) {
- //nothing we can do here, return what we have calculated thus far
- }
- return returnVersion;
- }
+
}
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 6e3109a..ae703f1 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
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.command.env.ui; singleton:=true
-Bundle-Version: 1.1.2.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Activator: org.eclipse.wst.command.internal.env.ui.plugin.EnvUIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java
index af01cd1..0b0586b 100644
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java
+++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java
@@ -13,7 +13,6 @@
* 20080512 222094 makandre@ca.ibm.com - Andrew Mak, Error handling when Ant template cannot be found
* 20080618 237671 makandre@ca.ibm.com - Andrew Mak, Label on Ant files wizard is truncated
* 20080716 238059 makandre@ca.ibm.com - Andrew Mak, New ant files wizard not working
- * 20081023 251911 ericdp@ca.ibm.com - Eric D. Peters, NPE in .log when choosing ant files to import
*******************************************************************************/
package org.eclipse.wst.command.internal.env.ui.dialog;
@@ -51,6 +50,7 @@
private LabelsAndIds labelsAndIdsScenario_;
private LabelsAndIds labelsAndIdsRuntime_;
// private int runtimeIdx_;
+ private Listener statusListener_;
public AntFileImportWizardPage(String pageName,
IStructuredSelection selection) {
@@ -109,6 +109,7 @@
public void widgetSelected(SelectionEvent e) {
handleRuntimeSelected();
+ statusListener_.handleEvent(null);
}
});
diff --git a/bundles/org.eclipse.wst.command.env/.classpath b/bundles/org.eclipse.wst.command.env/.classpath
index 0e66534..dce62b6 100644
--- a/bundles/org.eclipse.wst.command.env/.classpath
+++ b/bundles/org.eclipse.wst.command.env/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="ant-src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
index 8d1f2b0..7aa613a 100644
--- a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.command.env; singleton:=true
-Bundle-Version: 1.0.308.qualifier
+Bundle-Version: 1.0.306.qualifier
Bundle-Activator: org.eclipse.wst.command.internal.env.plugin.EnvPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.command.env/ant/axisclient.properties b/bundles/org.eclipse.wst.command.env/ant/axisclient.properties
index 65e659e..35ddbb0 100644
--- a/bundles/org.eclipse.wst.command.env/ant/axisclient.properties
+++ b/bundles/org.eclipse.wst.command.env/ant/axisclient.properties
@@ -25,7 +25,7 @@
!--Client.RuntimeId - ID of web service runtime
Client.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
!--Client.ServerId - ID of target server
-Client.ServerId=org.eclipse.jst.server.tomcat.60
+Client.ServerId=org.eclipse.jst.server.tomcat.50
!--ClientProjectName - name of Client project - this property can be used to give the client project a
!-- different name than the project containing the initial selection
diff --git a/bundles/org.eclipse.wst.command.env/ant/axisservice.properties b/bundles/org.eclipse.wst.command.env/ant/axisservice.properties
index df16224..126efe6 100644
--- a/bundles/org.eclipse.wst.command.env/ant/axisservice.properties
+++ b/bundles/org.eclipse.wst.command.env/ant/axisservice.properties
@@ -24,13 +24,13 @@
!-- Service.RuntimeId - ID of web service runtime
Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.60
+Service.ServerId=org.eclipse.jst.server.tomcat.50
!-- Service.TypeId - Java Bean is default for both Top Down and Bottom Up
!-- Service.TypeId=Java Bean
!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service EAR project- this property can be used to give the service EAR project a different name than the EAR project already associated with the service project. type: String
+!-- ServiceEarProjectName - !--type:String - name of Service project - this property can be used to give the service EAR project a different name than the project containing the initial selection. type: String
!--ServiceEarProjectName=serviceEarProjectName
!-- Mappings
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
index 75d5e56..d3d51ef 100644
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
+++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
@@ -18,13 +18,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-/**
- * @deprecated We should not depend on the auto build to build projects, since auto build might be off.
- * Try using BuildBeanCommand or BuildProjectCommand to build the project instead. Also, the join() call
- * can lead to deadlock in some situations.
- * @see org.eclipse.jst.ws.internal.consumption.command.common.BuildBeanCommand
- * @see org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand
-*/
+
public class WaitForAutoBuildCommand extends AbstractDataModelOperation
{
public IStatus execute( IProgressMonitor montitor, IAdaptable adaptable )
diff --git a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
index c1835ef..55a5e52 100644
--- a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.ws.explorer; singleton:=true
-Bundle-Version: 1.0.309.qualifier
+Bundle-Version: 1.0.306.qualifier
Bundle-Activator: org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
@@ -36,8 +36,7 @@
org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
org.eclipse.equinox.http.jetty,
org.eclipse.equinox.jsp.jasper.registry,
- org.eclipse.equinox.http.registry,
- javax.xml.rpc;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.equinox.http.registry
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javax.servlet;version="2.4.0",
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
index d35c649..b7070b3 100644
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
+++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20081119 255374 mahutch@ca.ibm.com - Mark Hutchinson
+ * IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.wst.ws.internal.explorer.platform.util;
import java.io.UnsupportedEncodingException;
-import java.net.URI;
import java.net.URLDecoder;
import java.net.URLEncoder;
@@ -102,19 +98,4 @@
throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
}
}
-
- /**
- * Encodes non-ASCII characters in a URL string.
- * @param urlString The URL string to encode
- * @return The URL as an encoded string
- */
- public static String encodeURLString(String urlString) {
- try {
- URI uri = new URI(urlString);
- return uri.toASCIIString();
- } catch (Exception e) {
- //do nothing, we will just return the original string
- }
- return urlString;
- }
}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
index e435612..a27ea80 100644
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
+++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
* 20060717 146707 mahutch@ca.ibm.com - Mark Hutchinson
* 20070124 167487 gilberta@ca.ibm.com - Gilbert Andrews
* 20080115 214955 gilberta@ca.ibm.com - Gilbert Andrews
- * 20081119 255374 mahutch@ca.ibm.com - Mark Hutchinson, WSE does not handle utf-8 characters in URLs
*******************************************************************************/
package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
@@ -44,7 +43,6 @@
import org.eclipse.wst.ws.internal.common.HTTPUtility;
import org.eclipse.wst.ws.internal.datamodel.Model;
import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
@@ -111,7 +109,7 @@
public void setWsdlUrl(String wsdlUrl) {
HTTPUtility http = new HTTPUtility();
- wsdlUrl_ = http.handleRedirect(URLUtils.encodeURLString(wsdlUrl));
+ wsdlUrl_ = http.handleRedirect(wsdlUrl);
}
public String getWsdlUrl() {
@@ -266,18 +264,15 @@
}
}
xsdSchemaDirectiveURL.append(xsdSchemaDirectiveLocation);
-
- //encode the URL so that Schemas with non-ASCII filenames can be resolved
- String xsdSchemaDirectiveURLString = URLUtils.encodeURLString(xsdSchemaDirectiveURL.toString());
// resolve schema directive
XSDSchema resolvedSchema = xsdSchemaDirective.getResolvedSchema();
- if (resolvedSchema == null && xsdSchemaDirectiveURLString.length() > 0)
- resolvedSchema = getSchema(xsdSchemaDirectiveURLString);
+ if (resolvedSchema == null && xsdSchemaDirectiveURL.length() > 0)
+ resolvedSchema = getSchema(xsdSchemaDirectiveURL.toString());
if (resolvedSchema != null)
{
- if(!checkSchemaURI(xsdSchemaDirectiveURLString)){
+ if(!checkSchemaURI(xsdSchemaDirectiveURL.toString())){
schemaList_.addElement(resolvedSchema);
- gatherSchemaDirective(resolvedSchema, xsdSchemaDirectiveURLString);
+ gatherSchemaDirective(resolvedSchema, xsdSchemaDirectiveURL.toString());
}
}
}
@@ -372,7 +367,6 @@
private final XSDSchema getSchema(String locURI)
{
- locURI = URLUtils.encodeURLString(locURI);
XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(locURI);
if (xsdSchema == null)
{
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
index 8665190..147334d 100644
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
+++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,8 +12,6 @@
* 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
* 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
* 20071024 206556 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080905 246265 mahutch@ca.ibm.com - Mark Hutchinson
- * 20080911 247096 kathy@ca.ibm.com - Kathy Chan
*******************************************************************************/
package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
@@ -34,7 +32,6 @@
import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
import org.eclipse.wst.ws.internal.explorer.platform.perspective.TransportProviderRegistry;
import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
@@ -46,7 +43,6 @@
import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
import org.eclipse.wst.ws.internal.explorer.transport.MessageContext;
import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
import org.eclipse.xsd.XSDNamedComponent;
public class WSDLOperationElement extends WSDLCommonElement
@@ -339,22 +335,6 @@
}
else
config.setPartEncoding(FragmentConstants.ENCODING_URL);
-
- //bug 246265: for usability, if the type is a soap encoded string then we do not want to display or send the optional "id" or "href" attributes
- QName typeName = part.getTypeName();
- if (typeName != null) {
- String localPart = typeName.getLocalPart();
- String namespaceURI = typeName.getNamespaceURI();
-
- if ("string".equals(localPart) && "http://schemas.xmlsoap.org/soap/encoding/".equals(namespaceURI) ) {
- if (config.getXSDComponent() instanceof XSDComplexTypeDefinition) {
- XSDComplexTypeDefinition xsd = (XSDComplexTypeDefinition)config.getXSDComponent();
- xsd.getAttributeUses().clear();
- xsd.getAttributeContents().clear();
- }
- }
- }
-
IXSDFragment fragment = getXSDToFragmentController().getFragment(config, id.toString(), part.getName());
// let's see if there's a corresponding wrapper for this fragment
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java
index 1d0ea5d..ca92c97 100644
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java
+++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
* -------- -------- -----------------------------------------------------------
* 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
* 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20081114 254672 mahutch@ca.ibm.com - Mark Hutchinson
*******************************************************************************/
package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
@@ -228,13 +227,12 @@
String prefix = getPrefixFromNamespaceURI(FragmentConstants.NS_URI_SOAP_ENV, namespaceTable) + FragmentConstants.COLON;
for (int i = 0; i < elements.length; i++) {
+
+ if (mustUnderstand)
+ elements[i].setAttribute(prefix + MUST_UNDERSTAND, "1");
- if (mustUnderstand){
- elements[i].setAttributeNS(FragmentConstants.NS_URI_SOAP_ENV, prefix + MUST_UNDERSTAND, "1");
- }
- if (actor.length() > 0){
- elements[i].setAttributeNS(FragmentConstants.NS_URI_SOAP_ENV,prefix + ACTOR, actor);
- }
+ if (actor.length() > 0)
+ elements[i].setAttribute(prefix + ACTOR, actor);
}
return elements;
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java
index 0532112..ddef318 100644
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java
+++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java
@@ -10,7 +10,6 @@
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
* 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20081020 251269 mahutch@ca.ibm.com - Mark Hutchinson, WSE Sends Wrong Namespace for child elements of the SOAP body
*******************************************************************************/
package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
@@ -77,9 +76,8 @@
/*
* Retrieves the encoding information from the binding for the selected operation.
* This method is called only for RPC style bindings. Two pieces of information are returned:
- * This method returns the encoding namespace in element [0]
- * If the use is encoded then the encoding style(s) is returned in element [1]. If the use is literal,
- * then element[1] is returned null.
+ * If the use is encoded, this method returns the encoding namespace in element [0] and the
+ * encoding style(s) in element [1]. If the use is literal, then both values will be null.
*/
private String[] getEncodingInfo(MessageContext context) {
@@ -96,9 +94,9 @@
SOAPBody soapBody = (SOAPBody) e;
- info[0] = soapBody.getNamespaceURI();
// use="encoded"
if (!LITERAL.equals(soapBody.getUse())) {
+ info[0] = soapBody.getNamespaceURI();
info[1] = joinEncodingStyles(soapBody.getEncodingStyles());
}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
index fdd8671..8fc8346 100644
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
+++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
@@ -1,17 +1,16 @@
/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
* 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
* 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20090119 261397 mahutch@ca.ibm.com - Mark Hutchinson
*******************************************************************************/
package org.eclipse.wst.ws.internal.explorer.platform.wsdl.util;
@@ -58,7 +57,7 @@
public static final Element createSoapEnvelopeElement(Document doc,Hashtable soapEnvelopeNamespaceTable)
{
- Element soapEnvelopeElement = doc.createElementNS(Constants.URI_SOAP11_ENV, Constants.NS_PREFIX_SOAP_ENV + ":Envelope");
+ Element soapEnvelopeElement = doc.createElement("soapenv:Envelope");
Enumeration e = soapEnvelopeNamespaceTable.keys();
while (e.hasMoreElements())
{
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
index 505bd1e..1e3fe4b 100644
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
+++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
@@ -1,15 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * Copyright (c) 2001, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20081119 255374 mahutch@ca.ibm.com - Mark Hutchinson, WSE does not handle utf-8 characters in URLs
+ * IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
@@ -30,7 +27,6 @@
import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
@@ -68,7 +64,6 @@
public boolean run()
{
String wsilURL = (String)propertyTable_.get(WsilActionInputs.WSIL_URL);
- wsilURL = URLUtils.encodeURLString(wsilURL);
int inspectionType = Integer.parseInt((String)propertyTable_.get(WsilActionInputs.WSIL_INSPECTION_TYPE));
WSILPerspective wsilPerspective = controller_.getWSILPerspective();
MessageQueue msgQueue = wsilPerspective.getMessageQueue();
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp
index 0d5cb5a..71c35bc 100644
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp
+++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp
@@ -11,8 +11,6 @@
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
* 20060427 127443 jesper@selskabet.org - Jesper S Moller
- * 20081106 254516 mahutch@ca.ibm.com - Mark Hutchinson, fix compilation error, remove duplicate variable declaration
- * 20081217 259140 mahutch@ca.ibm.com - Mark Hutchinson
*******************************************************************************/
%>
<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
@@ -643,8 +641,6 @@
<%
String titleImagePath = "uddi/images/find_highlighted.gif";
String title;
- //The JSP validator claims this subQueryKey variable declaration is
- //invalid, but removing it causes the JSP not to compile on Jetty.
String subQueryKey = subQueryKeyProperty.getSubQueryKey();
if (subQueryKey != null && subQueryKey.length() > 0)
{
diff --git a/bundles/org.eclipse.wst.ws.service.policy.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.service.policy.ui/META-INF/MANIFEST.MF
index bd55062..5c6226e 100644
--- a/bundles/org.eclipse.wst.ws.service.policy.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws.service.policy.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.ws.service.policy.ui;singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.wst.ws.service.policy.ui.ServicePolicyActivatorUI
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.ws.service.policy.ui/schema/servicePolicyui.exsd b/bundles/org.eclipse.wst.ws.service.policy.ui/schema/servicePolicyui.exsd
index 4a104c9..586c55a 100644
--- a/bundles/org.eclipse.wst.ws.service.policy.ui/schema/servicePolicyui.exsd
+++ b/bundles/org.eclipse.wst.ws.service.policy.ui/schema/servicePolicyui.exsd
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.service.policy.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.wst.service.policy.ui">
<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.service.policy.ui" id="servicepolicyui" name="Service policy UI"/>
- </appinfo>
+ <appInfo>
+ <meta.schema plugin="org.eclipse.wst.service.policy.ui" id="servicePolicyUI" name="Service policy UI"/>
+ </appInfo>
<documentation>
This extension allows extenders to add service policy UI operations for the
service policies that they have added.
@@ -12,11 +12,6 @@
</annotation>
<element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
<complexType>
<sequence>
<element ref="servicePolicyUI" minOccurs="1" maxOccurs="unbounded"/>
@@ -40,9 +35,9 @@
<documentation>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute translatable="true"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
</complexType>
@@ -192,13 +187,6 @@
</documentation>
</annotation>
</attribute>
- <attribute name="defaultItem" type="string">
- <annotation>
- <documentation>
- Sets the default for this boolean selection the values can be either org.eclipse.wst.true or org.eclipse.wst.false.
- </documentation>
- </annotation>
- </attribute>
</complexType>
</element>
@@ -291,40 +279,48 @@
</element>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="since"/>
- </appinfo>
+ </appInfo>
<documentation>
1.0
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="examples"/>
- </appinfo>
+ </appInfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="apiInfo"/>
- </appinfo>
+ </appInfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="implementation"/>
- </appinfo>
+ </appInfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
+ <annotation>
+ <appInfo>
+ <meta.section type="copyright"/>
+ </appInfo>
+ <documentation>
+
+ </documentation>
+ </annotation>
</schema>
diff --git a/bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/ServicePolicyRegistryUI.java b/bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/ServicePolicyRegistryUI.java
index b4818a4..294049a 100644
--- a/bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/ServicePolicyRegistryUI.java
+++ b/bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/ServicePolicyRegistryUI.java
@@ -11,7 +11,6 @@
* -------- -------- -----------------------------------------------------------
* 20071024 196997 pmoogk@ca.ibm.com - Peter Moogk
* 20080428 227501 pmoogk@ca.ibm.com - Peter Moogk, Fixed toLowerCase Locale problem.
- * 20080829 245754 pmoogk@ca.ibm.com - Peter Moogk, Added defaulting for selection operations.
*******************************************************************************/
package org.eclipse.wst.ws.internal.service.policy.ui;
@@ -23,7 +22,6 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.ws.service.policy.IDescriptor;
-import org.eclipse.wst.ws.service.policy.IPolicyStateEnum;
import org.eclipse.wst.ws.service.policy.ui.IQuickFixActionInfo;
import org.eclipse.wst.ws.service.policy.ui.ServicePolicyActivatorUI;
import org.eclipse.wst.ws.service.policy.utils.RegistryUtils;
@@ -31,7 +29,11 @@
public class ServicePolicyRegistryUI
{
private final String SERVICE_POLICY_ID = ServicePolicyActivatorUI.PLUGIN_ID + ".servicepolicyui"; //$NON-NLS-1$
-
+
+ public ServicePolicyRegistryUI()
+ {
+ }
+
public void load( Map<String, BaseOperationImpl> operationMap, Map<String, List<IQuickFixActionInfo>> quickFixes )
{
IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(SERVICE_POLICY_ID);
@@ -122,18 +124,7 @@
{
icon = true;
useDefaultData = true;
- }
-
- defaultItem = RegistryUtils.getAttribute( child, "defaultitem" ); //$NON-NLS-1$
-
- // If the defaultItem
- if( defaultItem != null &&
- !defaultItem.equals( IPolicyStateEnum.FALSE_ENUM) &&
- !defaultItem.equals( IPolicyStateEnum.TRUE_ENUM ) )
- {
- error( "The defaultItem attribute of a selection element must be: " + IPolicyStateEnum.TRUE_ENUM + " or " + IPolicyStateEnum.FALSE_ENUM + "." ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- error = true;
- }
+ }
}
else if( name.equals( "complex" ) ) //$NON-NLS-1$
{
diff --git a/bundles/org.eclipse.wst.ws.service.policy/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.service.policy/META-INF/MANIFEST.MF
index 641d011..8d30bf3 100644
--- a/bundles/org.eclipse.wst.ws.service.policy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws.service.policy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.ws.service.policy;singleton:=true
-Bundle-Version: 1.0.3.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.wst.ws.service.policy.ServicePolicyActivator
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.ws.service.policy/schema/servicePolicy.exsd b/bundles/org.eclipse.wst.ws.service.policy/schema/servicePolicy.exsd
index fd6d5b5..cde818d 100644
--- a/bundles/org.eclipse.wst.ws.service.policy/schema/servicePolicy.exsd
+++ b/bundles/org.eclipse.wst.ws.service.policy/schema/servicePolicy.exsd
@@ -133,7 +133,7 @@
<attribute name="iconPath" type="string">
<annotation>
<documentation>
- A plugin relative path to some icon file for this service policy, or alternatively, a complete plugin path to the icon file, in format plugin://pluginName/pluginRelativePath (example plugin://com.mycompany.myplugin/icons/icon.gif)
+ A plugin relative path to some icon file for this service policy.
</documentation>
</annotation>
</attribute>
diff --git a/bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/utils/RegistryUtils.java b/bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/utils/RegistryUtils.java
index 1fec830..a7214cd 100644
--- a/bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/utils/RegistryUtils.java
+++ b/bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/utils/RegistryUtils.java
@@ -13,7 +13,6 @@
* 20071024 196997 pmoogk@ca.ibm.com - Peter Moogk
* 20080428 227501 pmoogk@ca.ibm.com - Peter Moogk, Fixed toLowerCase Locale problem.
* 20080516 232603 pmoogk@ca.ibm.com - Peter Moogk, Clean up java doc
- * 20080905 246428 pmoogk@ca.ibm.com - Peter Moogk, Added iconBundleId parsing.
*******************************************************************************/
package org.eclipse.wst.ws.service.policy.utils;
@@ -65,20 +64,9 @@
descriptor.setContextHelpId( contextHelp );
if( iconPath != null )
- {
- String iconBundleId = element.getContributor().getName();
- String pluginPrefix = "plugin://"; //$NON-NLS-1$
-
- if( iconPath.startsWith( pluginPrefix ) && iconPath.length() > pluginPrefix.length() )
- {
- int pluginSlash = iconPath.indexOf( '/', pluginPrefix.length() );
-
- iconBundleId = iconPath.substring( pluginPrefix.length(), pluginSlash );
- iconPath = iconPath.substring( pluginSlash + 1 );
- }
-
- descriptor.setIconPath( iconPath );
- descriptor.setIconBundleId( iconBundleId );
+ {
+ descriptor.setIconPath( iconPath );
+ descriptor.setIconBundleId( element.getContributor().getName() );
}
descriptor.resetHasChanged();
diff --git a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
index 0b34368..8073896 100644
--- a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.ws; singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Activator: org.eclipse.wst.ws.internal.plugin.WSPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIComplianceUtils.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIComplianceUtils.java
index d488404..4a71383 100644
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIComplianceUtils.java
+++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIComplianceUtils.java
@@ -1,15 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080827 245439 ericdp@ca.ibm.com - Eric D. Peters, Usability issue with the compliance warning dialog
+ * IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.wst.ws.internal.preferences;
@@ -68,11 +65,8 @@
Choice cancelChoice = new Choice('C', WstWSPluginMessages.CANCEL_LABEL, WstWSPluginMessages.CANCEL_DESCRIPTION);
Choice result = monitor.report(status_, new Choice[]{ignoreChoice, ignoreAllChoice, cancelChoice});
- // if the user selects to cancel, or closes/escapes the message box, do not continue with the command
- if (result == null || result.getLabel().equals(cancelChoice.getLabel()))
- return false;
- // if the user selects ignore, continue
- else if (result.getLabel().equals(ignoreChoice.getLabel()))
+ // if the user closes the message box or selects ignore continue
+ if (result == null || (result.getLabel().equals(ignoreChoice.getLabel())))
return true;
// if the user selects ignore all, change the preference
else if (result.getLabel().equals(ignoreAllChoice.getLabel()))
@@ -80,7 +74,9 @@
context.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI);
return true;
}
-
+ // if the user selects to cancel , do not continue with the command
+ else if (result.getLabel().equals(cancelChoice.getLabel()))
+ return false;
}
return true;
}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WSDLURLStringWrapper.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WSDLURLStringWrapper.java
deleted file mode 100644
index a6aba89..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WSDLURLStringWrapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20081208 257618 mahutch@ca.ibm.com - Mark Hutchinson, Add Mechanism for Adopters to map Services to WSDL URLs
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.wsfinder;
-
-public class WSDLURLStringWrapper {
-
- public String wsdlURL;
-
- public WSDLURLStringWrapper(String wsdlURL) {
- this.wsdlURL = wsdlURL;
- }
-
- public String getWSDLURLString() {
- return wsdlURL;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
index ee49f4f..523c863 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %_UI_PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.wsdl.ui; singleton:=true
-Bundle-Version: 1.2.104.qualifier
+Bundle-Version: 1.2.101.qualifier
Bundle-Activator: org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLActionBarContributor.java
index b7eeda0..79ca421 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLActionBarContributor.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLActionBarContributor.java
@@ -135,9 +135,6 @@
{
zoomComboContributionItem.setVisible(!isSource);
zoomComboContributionItem.update();
- // Bug 254772 - parent contribution manager should not be null. We added this item already.
- // Force the ToolBarManager to update/redraw the items
- zoomComboContributionItem.getParent().update(true);
}
}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
index e3a1489..0b1eaab 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -128,7 +128,7 @@
Binding binding = (Binding) iterator.next();
// Find only Bindings which reference the modified PortType-->Operation
- if (portType.equals(binding.getPortType())) {
+ if (binding.getPortType().equals(portType)) {
String operationInputName = null;
String operationOutputName = null;
if(operation.getInput() != null) {
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11MessageReferenceSection.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11MessageReferenceSection.java
index cf328df..3b08b38 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11MessageReferenceSection.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11MessageReferenceSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * Copyright (c) 2001, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,7 +40,6 @@
protected CLabel comboLabel;
protected CCombo combo;
protected ComponentReferenceEditManager refManager;
- private boolean isTraversing = false;
public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
{
@@ -54,9 +53,8 @@
combo = getWidgetFactory().createCCombo(composite);
combo.setBackground(composite.getBackground());
- combo.addListener(SWT.Modify, this);
- combo.addListener(SWT.DefaultSelection, this);
- combo.addListener(SWT.Traverse, this);
+ combo.addListener(SWT.Modify, this);
+ combo.addSelectionListener(this);
PlatformUI.getWorkbench().getHelpSystem().setHelp(combo, ASDEditorCSHelpIds.PROPERTIES_MESSAGE_REF_MESSAGE_COMBO);
comboLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_MESSAGE + ":"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -121,6 +119,7 @@
setControlForegroundColor(combo);
setListenerEnabled(true);
+
// MessageReference messageRef = (MessageReference) ((W11MessageReference) getModel()).getTarget();
// Iterator it = messageRef.getEnclosingDefinition().getEMessages().iterator();
// while (it.hasNext()) {
@@ -148,16 +147,11 @@
public void handleEvent(Event event)
{
if (event.widget == combo) {
- if (isListenerEnabled() && !isInDoHandle) {
- if (event.type == SWT.Traverse) {
- if (event.detail == SWT.TRAVERSE_ARROW_NEXT || event.detail == SWT.TRAVERSE_ARROW_PREVIOUS)
- isTraversing = true;
- }
- else {
- isInDoHandle = true;
- startDelayedEvent(event);
- isInDoHandle = false;
- }
+ if (isListenerEnabled() && !isInDoHandle)
+ {
+ isInDoHandle = true;
+ startDelayedEvent(event);
+ isInDoHandle = false;
}
}
else {
@@ -168,39 +162,40 @@
public void doHandleEvent(Event event)
{
super.doHandleEvent(event);
- if (event.widget == combo) {
+ if (event.widget == combo) {
String value = ""; //$NON-NLS-1$
if (combo.getSelectionIndex() != -1) {
value = combo.getItem(combo.getSelectionIndex());
}
- if (shouldPerformComboSelection(event, value)) {
- ComponentSpecification spec = null;
- int continueApply = Window.OK;
- IMessageReference messageRef = (IMessageReference) this.getModel();
-
- if (value.equals(NEW_STRING)) {
- ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
- IComponentDialog dialog = editManager.getNewDialog();
- continueApply = dialog.createAndOpen();
- spec = dialog.getSelectedComponent();
- }
- else if (value.equals(BROWSE_STRING)) {
- ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
- IComponentDialog dialog = editManager.getBrowseDialog();
- continueApply = dialog.createAndOpen();
- spec = dialog.getSelectedComponent();
- }
- else {
- spec = getComponentSpecificationForValue((String)value);
- }
-
- if (continueApply == Window.OK) {
- ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
- if (spec != null) {
- editManager.modifyComponentReference(messageRef, spec);
- }
- }
- }
+
+ ComponentSpecification spec = null;
+ int continueApply = Window.OK;
+ IMessageReference messageRef = (IMessageReference) this.getModel();
+
+ if (value.equals(NEW_STRING)) {
+ ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
+ IComponentDialog dialog = editManager.getNewDialog();
+ continueApply = dialog.createAndOpen();
+ spec = dialog.getSelectedComponent();
+ }
+ else if (value.equals(BROWSE_STRING)) {
+ ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
+ IComponentDialog dialog = editManager.getBrowseDialog();
+ continueApply = dialog.createAndOpen();
+ spec = dialog.getSelectedComponent();
+ }
+ else {
+ spec = getComponentSpecificationForValue((String)value);
+ }
+
+ if (continueApply == Window.OK) {
+ ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
+ if (spec != null) {
+ editManager.modifyComponentReference(messageRef, spec);
+ }
+ }
+
+
}
}
@@ -236,43 +231,4 @@
}
return null;
}
-
- private boolean shouldPerformComboSelection(Event event, Object selectedItem)
- {
- // if traversing through combobox, don't automatically pop up
- // the browse and new dialog boxes
- boolean wasTraversing = isTraversing;
- if (isTraversing)
- {
- isTraversing = false;
- }
-
- // we only care about default selecting (hitting enter in combobox)
- // for browse.. and new..
- if (event.type == SWT.DefaultSelection)
- {
- if (!(selectedItem instanceof String))
- return false;
- if (!(BROWSE_STRING.equals(selectedItem) || NEW_STRING.equals(selectedItem)))
- return false;
- }
-
- if (wasTraversing && selectedItem instanceof String)
- {
- if (BROWSE_STRING.equals(selectedItem) || NEW_STRING.equals(selectedItem))
- return false;
- }
- return true;
- }
-
- public void dispose()
- {
- if (combo != null && !combo.isDisposed())
- {
- combo.removeListener(SWT.Modify, this);
- combo.removeListener(SWT.DefaultSelection, this);
- combo.removeListener(SWT.Traverse, this);
- }
- super.dispose();
- }
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11ParameterSection.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11ParameterSection.java
index ffe3682..2b262d4 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11ParameterSection.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11ParameterSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
@@ -86,33 +87,34 @@
}
}
- protected void handleComboSelection()
- {
- if (elementRadio.getSelection()) {
- // Handle Element selection
- String value = combo.getItem(combo.getSelectionIndex());
-
- W11ParameterForPart parameter = (W11ParameterForPart) this.getModel();
-
- if (value.equals(NEW_STRING)) {
- Command command = parameter.getSetElementCommand(IParameter.SET_NEW_ACTION_ID);
- command.execute();
- }
- else if (value.equals(BROWSE_STRING)) {
- Command command = parameter.getSetElementCommand(IParameter.SELECT_EXISTING_ACTION_ID);
- command.execute();
- }
- else {
- ComponentReferenceEditManager editManager = getElementComponentReferenceEditManager();
- ComponentSpecification spec = getComponentSpecificationForValue((String)value);
- if (spec != null) {
- editManager.modifyComponentReference(parameter, spec);
+ public void doHandleEvent(Event event) {
+ if (event.widget == combo) {
+ if (elementRadio.getSelection()) {
+ // Handle Element selection
+ String value = combo.getItem(combo.getSelectionIndex());
+
+ W11ParameterForPart parameter = (W11ParameterForPart) this.getModel();
+
+ if (value.equals(NEW_STRING)) {
+ Command command = parameter.getSetElementCommand(IParameter.SET_NEW_ACTION_ID);
+ command.execute();
+ }
+ else if (value.equals(BROWSE_STRING)) {
+ Command command = parameter.getSetElementCommand(IParameter.SELECT_EXISTING_ACTION_ID);
+ command.execute();
+ }
+ else {
+ ComponentReferenceEditManager editManager = getElementComponentReferenceEditManager();
+ ComponentSpecification spec = getComponentSpecificationForValue((String)value);
+ if (spec != null) {
+ editManager.modifyComponentReference(parameter, spec);
+ }
}
}
}
- else if (handleTypeScenario) {
- super.handleComboSelection();
- }
+
+ super.doHandleEvent(event);
+ refresh();
}
protected void refreshElementCombo() {
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/XSDTypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/XSDTypeSystemProvider.java
index e200aac..bf913c9 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/XSDTypeSystemProvider.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/XSDTypeSystemProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * Copyright (c) 2001, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,8 +11,6 @@
package org.eclipse.wst.wsdl.ui.internal.util;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -27,10 +25,7 @@
import org.eclipse.xsd.XSDSchema;
import org.eclipse.xsd.XSDSchemaContent;
import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
import org.eclipse.xsd.impl.XSDImportImpl;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
public class XSDTypeSystemProvider implements ITypeSystemProvider
{
@@ -159,42 +154,25 @@
return keepTypes;
}
- /**
- * Provides a list with XML schema built in type names. The names are
- * prefixed if the the definition provides a prefix for the XML schema
- * namespace.
- *
- * @param definition
- * a WSDL {@link Definition}. Must not be null.
- * @return a {@link List} of {@link String} representing the XML Schema built in type names,
- * or an empty list if the definition is null.
- */
- public List getBuiltInTypeNamesList(Definition definition)
+ public java.util.List getBuiltInTypeNamesList(Definition definition)
{
- if (definition == null)
- {
- return Collections.EMPTY_LIST;
- }
-
- List builtInTypeNames = new ArrayList();
-
- XSDSchema schemaForSchema = XSDSchemaImpl.getSchemaForSchema(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
- Map simpleTypeIdMap = schemaForSchema.getSimpleTypeIdMap();
- Collection builtInTypes = simpleTypeIdMap.values();
- Iterator iterator = builtInTypes.iterator();
- String xsdPrefix = definition.getPrefix(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-
- while (iterator.hasNext())
- {
- XSDTypeDefinition typeDefinition = (XSDTypeDefinition) iterator.next();
- String localName = typeDefinition.getName();
- String prefixedName = (xsdPrefix != null && xsdPrefix.length() > 0) ? xsdPrefix + ":" + localName : localName; //$NON-NLS-1$
- builtInTypeNames.add(prefixedName);
- }
-
- return builtInTypeNames;
+ List items = new ArrayList();
+// if (definition != null)
+// {
+// List prefixes = getPrefixes(definition, WSDLConstants.XSD_NAMESPACE_URI);
+// for (Iterator i = prefixes.iterator(); i.hasNext();)
+// {
+// String prefix = (String) i.next();
+// for (int j = 0; j < XSDDOMHelper.dataType.length; j++)
+// {
+// String localName = XSDDOMHelper.dataType[j][0];
+// String name = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName;
+// items.add(name);
+// }
+// }
+// }
+ return items;
}
-
public List getAvailableElementNames(Definition definition)
{
List list = new ArrayList();
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDCCombo.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDCCombo.java
index 23af5e5..6c9b357 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDCCombo.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDCCombo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -408,7 +408,7 @@
}
void dropDown (boolean drop) {
if (drop == isDropped ()) return;
- if (!drop && !isDisposed()) {
+ if (!drop) {
popup.setVisible (false);
text.selectAll();
if (!isDisposed ()&& arrow.isFocusControl()) {
@@ -917,7 +917,9 @@
e.time = event.time;
e.stateMask = event.stateMask;
e.doit = event.doit;
- notifyListeners (SWT.Selection, e);
+ if (!isDropped()) {
+ notifyListeners (SWT.Selection, e);
+ }
event.doit = e.doit;
break;
}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDComboBoxCellEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDComboBoxCellEditor.java
index d674ee0..6ecf5ad 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDComboBoxCellEditor.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDComboBoxCellEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -55,9 +55,6 @@
private Object selectedValue;
private ComponentReferenceEditManager componentReferenceEditManager;
private int textIndent = 5;
- private boolean isTraversing = false;
- // This prevents the cell editor from being deactivated while handling the New or Browse selection.
- private boolean isHandlingSelection = false;
/**
* Default ComboBoxCellEditor style
@@ -136,10 +133,6 @@
|| e.detail == SWT.TRAVERSE_RETURN) {
e.doit = false;
}
- if (e.detail == SWT.TRAVERSE_ARROW_NEXT || e.detail == SWT.TRAVERSE_ARROW_PREVIOUS)
- {
- isTraversing = true;
- }
}
});
@@ -261,7 +254,7 @@
* @see org.eclipse.jface.viewers.CellEditor#focusLost()
*/
protected void focusLost() {
- if (isActivated() && !isHandlingSelection) {
+ if (isActivated()) {
applyEditorValueAndDeactivate();
}
}
@@ -284,28 +277,17 @@
public void selectionMade() {
- isHandlingSelection = true;
Object newValue = null;
- try {
- selection = comboBox.getSelectionIndex();
- if (isTraversing)
- {
- isTraversing = false;
- return;
- }
- String stringSelection = items[selection];
-
- if (stringSelection.equals(Messages._UI_BUTTON_BROWSE)) { //$NON-NLS-1$
- newValue = invokeDialog(componentReferenceEditManager.getBrowseDialog());
- }
- else if (stringSelection.equals(Messages._UI_BUTTON_NEW)) { //$NON-NLS-1$
- newValue = invokeDialog(componentReferenceEditManager.getNewDialog());
- }
+ selection = comboBox.getSelectionIndex();
+ String stringSelection = items[selection];
+
+ if (stringSelection.equals(Messages._UI_BUTTON_BROWSE)) { //$NON-NLS-1$
+ newValue = invokeDialog(componentReferenceEditManager.getBrowseDialog());
}
- finally
- {
- isHandlingSelection = false;
- }
+ else if (stringSelection.equals(Messages._UI_BUTTON_NEW)) { //$NON-NLS-1$
+ newValue = invokeDialog(componentReferenceEditManager.getNewDialog());
+ }
+
if (newValue == null) {
int index = comboBox.getSelectionIndex();
if (index != -1) {
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/BindingEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/BindingEditPart.java
index 880eccd..0ac31f9 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/BindingEditPart.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/BindingEditPart.java
@@ -11,6 +11,7 @@
package org.eclipse.wst.wsdl.ui.internal.asd.design.editparts;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import org.eclipse.draw2d.ColorConstants;
@@ -41,7 +42,6 @@
public class BindingEditPart extends BaseEditPart
{
protected ComponentReferenceConnection connectionFigure;
- private ComponentReferenceConnection connectionFeedbackFigure;
protected BoxComponentFigure figure;
protected boolean isExpanded = false;
private Label hoverHelpLabel = new Label(""); //$NON-NLS-1$
@@ -91,11 +91,10 @@
// boxFigureLineBorder.setColor(ColorConstants.darkBlue);
figure.setSelected(true);
figure.repaint();
- if (connectionFigure != null && connectionFigure.isVisible())
+ if (connectionFigure != null)
{
connectionFigure.setHighlight(true);
-
- addConnectionFeedbackFigure();
+ getLayer(LayerConstants.FEEDBACK_LAYER).add(connectionFigure);
}
}
@@ -107,12 +106,10 @@
boxFigureLineBorder.setColor(DesignViewGraphicsConstants.defaultForegroundColor);
figure.setSelected(false);
figure.repaint();
-
- removeConnectionFeedbackFigure();
-
if (connectionFigure != null)
{
connectionFigure.setHighlight(false);
+ getLayer(LayerConstants.CONNECTION_LAYER).add(connectionFigure);
}
}
@@ -136,9 +133,34 @@
{
if (connectionFigure != null)
{
- getLayer(LayerConstants.CONNECTION_LAYER).remove(connectionFigure);
+ boolean removed = false;
+ removed = removeConnectionFigure(getLayer(LayerConstants.CONNECTION_LAYER));
+ if (!removed)
+ {
+ removeConnectionFigure(getLayer(LayerConstants.FEEDBACK_LAYER));
+ }
}
- removeConnectionFeedbackFigure();
+ }
+
+
+ private boolean removeConnectionFigure(IFigure parent)
+ {
+ boolean contains = false;
+ Iterator it = parent.getChildren().iterator();
+ while (it.hasNext())
+ {
+ IFigure fig = (IFigure) it.next();
+ if (fig.equals(connectionFigure))
+ {
+ contains = true;
+ break;
+ }
+ }
+ if (contains)
+ {
+ parent.remove(connectionFigure);
+ }
+ return contains;
}
public ComponentReferenceConnection createConnectionFigure()
@@ -227,11 +249,6 @@
connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(refFigure, CenteredConnectionAnchor.HEADER_LEFT, 0, 11));
connectionFigure.setHighlight(false);
connectionFigure.setVisible(true);
-
- if (connectionFeedbackFigure != null)
- {
- addConnectionFeedbackFigure();
- }
}
else
{
@@ -241,7 +258,6 @@
else if (connectionFigure != null)
{
connectionFigure.setVisible(false);
- removeConnectionFeedbackFigure();
}
}
@@ -289,25 +305,4 @@
}
return super.getRelativeEditPart(direction);
}
-
- private void addConnectionFeedbackFigure()
- {
- // remove any preexisting connection feedback figures first
- removeConnectionFeedbackFigure();
-
- connectionFeedbackFigure = new ComponentReferenceConnection();
- connectionFeedbackFigure.setSourceAnchor(connectionFigure.getSourceAnchor());
- connectionFeedbackFigure.setTargetAnchor(connectionFigure.getTargetAnchor());
- connectionFeedbackFigure.setHighlight(true);
- getLayer(LayerConstants.FEEDBACK_LAYER).add(connectionFeedbackFigure);
- }
-
- private void removeConnectionFeedbackFigure() {
- if (connectionFeedbackFigure != null)
- {
- connectionFeedbackFigure.setHighlight(false);
- getLayer(LayerConstants.FEEDBACK_LAYER).remove(connectionFeedbackFigure);
- connectionFeedbackFigure = null;
- }
- }
}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/EndPointEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/EndPointEditPart.java
index 637d5e9..1e3b271 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/EndPointEditPart.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/EndPointEditPart.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.wst.wsdl.ui.internal.asd.design.editparts;
+import java.util.Iterator;
+
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.Figure;
import org.eclipse.draw2d.FigureCanvas;
@@ -53,7 +55,6 @@
private Label hoverHelpLabel = new Label(""); //$NON-NLS-1$
protected Figure addressBoxFigure;
protected ComponentReferenceConnection connectionFigure;
- private ComponentReferenceConnection connectionFeedbackFigure;
protected final static int MAX_ADDRESS_WIDTH = 150;
protected IFigure createFigure()
@@ -227,10 +228,32 @@
protected void deactivateConnection()
{
if (connectionFigure != null)
- {
- getLayer(LayerConstants.CONNECTION_LAYER).remove(connectionFigure);
- }
- removeConnectionFeedbackFigure();
+ {
+ boolean removed = false;
+ removed = removeConnectionFigure(getLayer(LayerConstants.CONNECTION_LAYER));
+
+ if (!removed) {
+ removeConnectionFigure(getLayer(LayerConstants.FEEDBACK_LAYER));
+ }
+ }
+ }
+
+ private boolean removeConnectionFigure(IFigure parent) {
+ boolean contains = false;
+ Iterator it = parent.getChildren().iterator();
+ while (it.hasNext()) {
+ IFigure fig = (IFigure) it.next();
+ if (fig.equals(connectionFigure)) {
+ contains = true;
+ break;
+ }
+ }
+
+ if (contains) {
+ parent.remove(connectionFigure);
+ }
+
+ return contains;
}
protected boolean shouldDrawConnection()
@@ -291,11 +314,6 @@
connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(targetFigure, CenteredConnectionAnchor.HEADER_LEFT, 0, 10));
connectionFigure.setHighlight(false);
connectionFigure.setVisible(true);
-
- if (connectionFeedbackFigure != null)
- {
- addConnectionFeedbackFigure();
- }
}
else {
activateConnection();
@@ -303,7 +321,6 @@
}
else if (connectionFigure != null){
connectionFigure.setVisible(false);
- removeConnectionFeedbackFigure();
}
}
@@ -317,11 +334,9 @@
IFigure figure = getFigureForFeedback();
figure.setBackgroundColor(DesignViewGraphicsConstants.tableCellSelectionColor);
- if (connectionFigure != null && connectionFigure.isVisible())
- {
- connectionFigure.setHighlight(true);
-
- addConnectionFeedbackFigure();
+ if (connectionFigure != null) {
+ connectionFigure.setHighlight(true);
+ getLayer(LayerConstants.FEEDBACK_LAYER).add(connectionFigure);
}
}
@@ -329,11 +344,11 @@
{
IFigure figure = getFigureForFeedback();
figure.setBackgroundColor(figure.getParent().getBackgroundColor());
-
- removeConnectionFeedbackFigure();
- if (connectionFigure != null)
- connectionFigure.setHighlight(false);
+ if (connectionFigure != null) {
+ connectionFigure.setHighlight(false);
+ getLayer(LayerConstants.CONNECTION_LAYER).add(connectionFigure);
+ }
}
// TODO: rmah: VERY UGLY HACK.... I don't see any other way to solve this
@@ -375,25 +390,4 @@
return super.getRelativeEditPart(direction);
}
-
- private void addConnectionFeedbackFigure()
- {
- removeConnectionFeedbackFigure();
-
- connectionFeedbackFigure = new ComponentReferenceConnection();
- connectionFeedbackFigure.setSourceAnchor(connectionFigure.getSourceAnchor());
- connectionFeedbackFigure.setTargetAnchor(connectionFigure.getTargetAnchor());
- connectionFeedbackFigure.setHighlight(true);
- getLayer(LayerConstants.FEEDBACK_LAYER).add(connectionFeedbackFigure);
- }
-
- private void removeConnectionFeedbackFigure()
- {
- if (connectionFeedbackFigure != null)
- {
- connectionFeedbackFigure.setHighlight(false);
- getLayer(LayerConstants.FEEDBACK_LAYER).remove(connectionFeedbackFigure);
- connectionFeedbackFigure = null;
- }
- }
}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ParameterSection.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ParameterSection.java
index fa00bd1..be88d73 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ParameterSection.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ParameterSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,7 +36,6 @@
protected CCombo combo;
protected boolean handleTypeScenario = true;
protected ComponentReferenceEditManager parameterRefManager;
- private boolean isTraversing = false;
public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
{
@@ -51,8 +50,7 @@
combo = getWidgetFactory().createCCombo(composite);
combo.setBackground(composite.getBackground());
combo.addListener(SWT.Modify, this);
- combo.addListener(SWT.DefaultSelection, this);
- combo.addListener(SWT.Traverse, this);
+ combo.addSelectionListener(this);
comboLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_TYPE + ":"); //$NON-NLS-1$ //$NON-NLS-2$
data = new FormData();
@@ -170,16 +168,9 @@
if (event.widget == combo) {
if (isListenerEnabled() && !isInDoHandle)
{
- if (event.type == SWT.Traverse) {
- if (event.detail == SWT.TRAVERSE_ARROW_NEXT || event.detail == SWT.TRAVERSE_ARROW_PREVIOUS) {
- isTraversing = true;
- }
- }
- else {
- isInDoHandle = true;
- startDelayedEvent(event);
- isInDoHandle = false;
- }
+ isInDoHandle = true;
+ startDelayedEvent(event);
+ isInDoHandle = false;
}
}
else {
@@ -190,13 +181,9 @@
public void doHandleEvent(Event event)
{
super.doHandleEvent(event);
- if (event.widget == combo && !combo.isDisposed()) {
- String selectedItem = combo.getItem(combo.getSelectionIndex());
- if (shouldPerformComboSelection(event, selectedItem))
- {
- handleComboSelection();
- refresh();
- }
+ if (event.widget == combo && handleTypeScenario) {
+ handleComboSelection();
+ refresh();
}
}
@@ -271,41 +258,4 @@
}
return null;
}
-
- private boolean shouldPerformComboSelection(Event event, Object selectedItem)
- {
- // if traversing through combobox, don't automatically pop up
- // the browse and new dialog boxes
- boolean wasTraversing = isTraversing;
- if (isTraversing)
- isTraversing = false;
-
- // we only care about default selecting (hitting enter in combobox)
- // for browse.. and new..
- if (event.type == SWT.DefaultSelection)
- {
- if (!(selectedItem instanceof String))
- return false;
- if (!(BROWSE_STRING.equals(selectedItem) || NEW_STRING.equals(selectedItem)))
- return false;
- }
-
- if (wasTraversing && selectedItem instanceof String)
- {
- if (BROWSE_STRING.equals(selectedItem) || NEW_STRING.equals(selectedItem))
- return false;
- }
- return true;
- }
-
- public void dispose()
- {
- if (combo != null && !combo.isDisposed())
- {
- combo.removeListener(SWT.Modify, this);
- combo.removeListener(SWT.DefaultSelection, this);
- combo.removeListener(SWT.Traverse, this);
- }
- super.dispose();
- }
}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ReferenceSection.java b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ReferenceSection.java
index 01973f4..1722ddf 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ReferenceSection.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ReferenceSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * Copyright (c) 2001, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,7 +29,6 @@
public static String NEW_STRING = Messages._UI_BUTTON_NEW; //$NON-NLS-1$
protected CCombo combo;
protected CLabel comboLabel;
- private boolean isTraversing = false;
protected List itemsInCombo = new ArrayList();
@@ -60,24 +59,17 @@
data.top = new FormAttachment(nameText, +ITabbedPropertyConstants.VSPACE);
combo.setLayoutData(data);
- combo.addListener(SWT.Modify, this);
- combo.addListener(SWT.DefaultSelection, this);
- combo.addListener(SWT.Traverse, this);
+ combo.addListener(SWT.Modify, this);
}
public void handleEvent(Event event)
{
if (event.widget == combo) {
- if (isListenerEnabled() && !isInDoHandle) {
- if (event.type == SWT.Traverse) {
- if (event.detail == SWT.TRAVERSE_ARROW_NEXT || event.detail == SWT.TRAVERSE_ARROW_PREVIOUS)
- isTraversing = true;
- }
- else {
- isInDoHandle = true;
- startDelayedEvent(event);
- isInDoHandle = false;
- }
+ if (isListenerEnabled() && !isInDoHandle)
+ {
+ isInDoHandle = true;
+ startDelayedEvent(event);
+ isInDoHandle = false;
}
}
else {
@@ -90,8 +82,6 @@
*/
public void refresh() {
combo.removeListener(SWT.Modify, this);
- combo.removeListener(SWT.DefaultSelection, this);
- combo.removeListener(SWT.Traverse, this);
super.refresh();
@@ -124,8 +114,6 @@
setControlForegroundColor(combo);
combo.addListener(SWT.Modify, this);
- combo.addListener(SWT.DefaultSelection, this);
- combo.addListener(SWT.Traverse, this);
}
protected abstract List getComboItems();
@@ -143,50 +131,8 @@
super.doHandleEvent(event);
if (event.widget == combo && !combo.isDisposed()) {
int selectionIndex = combo.getSelectionIndex();
- Object selectedItem = itemsInCombo.get(selectionIndex);
-
- if (shouldPerformComboSelection(event, selectedItem))
- {
- performComboSelection(selectedItem);
- refresh();
- }
+ performComboSelection(itemsInCombo.get(selectionIndex));
+ refresh();
}
}
-
- private boolean shouldPerformComboSelection(Event event, Object selectedItem)
- {
- // if traversing through combobox, don't automatically pop up
- // the browse and new dialog boxes
- boolean wasTraversing = isTraversing;
- if (isTraversing)
- isTraversing = false;
-
- // we only care about default selecting (hitting enter in combobox)
- // for browse.. and new..
- if (event.type == SWT.DefaultSelection)
- {
- if (!(selectedItem instanceof String))
- return false;
- if (!(BROWSE_STRING.equals(selectedItem) || NEW_STRING.equals(selectedItem)))
- return false;
- }
-
- if (wasTraversing && selectedItem instanceof String)
- {
- if (BROWSE_STRING.equals(selectedItem) || NEW_STRING.equals(selectedItem))
- return false;
- }
- return true;
- }
-
- public void dispose()
- {
- if (combo != null && !combo.isDisposed())
- {
- combo.removeListener(SWT.Modify, this);
- combo.removeListener(SWT.DefaultSelection, this);
- combo.removeListener(SWT.Traverse, this);
- }
- super.dispose();
- }
}
diff --git a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
index 459a4ac..8a0f627 100644
--- a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.wsdl; singleton:=true
-Bundle-Version: 1.1.202.qualifier
+Bundle-Version: 1.1.201.qualifier
Bundle-Activator: org.eclipse.wst.wsdl.WSDLPluginImplementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
index 2b14c9a..7c0ea0d 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
@@ -1153,13 +1153,7 @@
*/
public javax.wsdl.Service removeService(QName name)
{
- WSDLElement wsdlElement = resolveWSDLElement(WSDLConstants.SERVICE, name);
- boolean removed = false;
- if (wsdlElement instanceof Service)
- removed = getEServices().remove(wsdlElement);
- if (!removed)
- wsdlElement = null;
- return (Service)wsdlElement;
+ return (javax.wsdl.Service)getServices().remove(name);
}
/**
@@ -1169,13 +1163,7 @@
*/
public javax.wsdl.Binding removeBinding(QName name)
{
- WSDLElement wsdlElement = resolveWSDLElement(WSDLConstants.BINDING, name);
- boolean removed = false;
- if (wsdlElement instanceof Binding)
- removed = getEBindings().remove(wsdlElement);
- if (!removed)
- wsdlElement = null;
- return (Binding)wsdlElement;
+ return (javax.wsdl.Binding)getBindings().remove(name);
}
/**
@@ -1185,13 +1173,7 @@
*/
public javax.wsdl.PortType removePortType(QName name)
{
- WSDLElement wsdlElement = resolveWSDLElement(WSDLConstants.PORT_TYPE, name);
- boolean removed = false;
- if (wsdlElement instanceof PortType)
- removed = getEPortTypes().remove(wsdlElement);
- if (!removed)
- wsdlElement = null;
- return (PortType)wsdlElement;
+ return (javax.wsdl.PortType)getPortTypes().remove(name);
}
/**
@@ -1201,13 +1183,7 @@
*/
public javax.wsdl.Message removeMessage(QName name)
{
- WSDLElement wsdlElement = resolveWSDLElement(WSDLConstants.MESSAGE, name);
- boolean removed = false;
- if (wsdlElement instanceof Message)
- removed = getEMessages().remove(wsdlElement);
- if (!removed)
- wsdlElement = null;
- return (Message)wsdlElement;
+ return (javax.wsdl.Message)getMessages().remove(name);
}
/**
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
index cae00fe..91fcb3f 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -65,13 +65,10 @@
{
int result = -1;
- if (WSDLConstants.isWSDLNamespace(element.getNamespaceURI()))
+ Integer integer = (Integer)elementNameToTypeMap.get(element.getLocalName());
+ if (integer != null)
{
- Integer integer = (Integer) elementNameToTypeMap.get(element.getLocalName());
- if (integer != null)
- {
- result = integer.intValue();
- }
+ result = integer.intValue();
}
return result;
}
diff --git a/docs/org.eclipse.wst.command.env.doc.user/.cvsignore b/docs/org.eclipse.wst.command.env.doc.user/.cvsignore
deleted file mode 100644
index a84668c..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.wst.command.env.doc.user_1.0.0.jar
-bak
-temp
diff --git a/docs/org.eclipse.wst.command.env.doc.user/.project b/docs/org.eclipse.wst.command.env.doc.user/.project
deleted file mode 100644
index ff3950b..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.command.env.doc.user</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/DocBuild.xml b/docs/org.eclipse.wst.command.env.doc.user/DocBuild.xml
deleted file mode 100644
index c0f0b66..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
- This script build the Help plug-in by transforming the DITA source files into HTML.
-
- To use this script, you must install DITA-OT on your machine in the directory
- defined by the dita.ot.dir property.
-
- Run the default target after you edit the DITA source files to regenerate the HTML.
-
- To customize this script for other Help plug-ins, modify the value of the args.input property
- to be the DITA map file for the plug-in.
-
- NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
- output directory structure will be shifted incorrectly.
-
- NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
- will be copied over the generated plugin.xml which is currently not being generated correctly
- by DITA-OT.
-
- ChangeLog:
- 2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
- - Created.
- 2008-01-09 Kate Price <katep@ca.ibm.com>
- - modified for new DITA-OT version
- 2008-05-05 Kate Price <katep@ca.ibm.com>
- - modified to add generation of pre-built help index.
- - Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
- <property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
- <path id="dost.class.path">
- <pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
- </path>
-
- <taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
- <classpath refid="dost.class.path" />
- </taskdef>
- <target name="all" depends="integrate, eclipsehelp">
- </target>
- <target name="integrate">
- <integrate ditadir="${dita.ot.dir}" />
- </target>
-
- <!-- revise below here -->
- <target name="eclipsehelp">
- <ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
- <property name="args.copycss" value="no" />
- <property name="args.csspath" value="../org.eclipse.wst.doc.user" />
- <property name="args.eclipse.provider" value="Eclipse.org" />
- <property name="args.eclipse.version" value="3.3.0" />
- <property name="args.input" location="wsaxisant_toc.ditamap" />
- <property name="clean.temp" value="true" />
- <property name="dita.extname" value=".dita" />
- <property name="dita.temp.dir" location="temp" />
- <property name="output.dir" location="" />
- <property name="transtype" value="eclipsehelp" />
- </ant>
- <copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
- </target>
- <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-</project>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.command.env.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 1aec675..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.command.env.doc.user;singleton:=true
-Bundle-Version: 1.5.200.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/docs/org.eclipse.wst.command.env.doc.user/about.html b/docs/org.eclipse.wst.command.env.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/build.properties b/docs/org.eclipse.wst.command.env.doc.user/build.properties
deleted file mode 100644
index dd424d6..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = plugin.properties,\
- plugin.xml,\
- wsaxisant_toc.xml,\
- about.html,\
- topics/*.htm*,\
- index/,\
- META-INF/,\
- org.eclipse.wst.command.env.doc.userindex.xml
-src.includes = build.properties,\
- *.maplist,\
- *.ditamap,\
- topics/*.dita,\
- org.eclipse.wst.command.env.doc.userindex.xml
-bin.excludes = DocBuild.xml,\
- myPlugin*.xml
diff --git a/docs/org.eclipse.wst.command.env.doc.user/index/_6.cfs b/docs/org.eclipse.wst.command.env.doc.user/index/_6.cfs
deleted file mode 100644
index 9e34ed7..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/index/_6.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.command.env.doc.user/index/deletable b/docs/org.eclipse.wst.command.env.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.command.env.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.command.env.doc.user/index/indexed_contributions
deleted file mode 100644
index ebb713a..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 20:31:22 EDT 2008
-org.eclipse.wst.command.env.doc.user=org.eclipse.wst.command.env.doc.user\n1.5.200.qualifier
diff --git a/docs/org.eclipse.wst.command.env.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.command.env.doc.user/index/indexed_dependencies
deleted file mode 100644
index e4094ef..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 20:31:22 EDT 2008
-lucene=1.9.1.v200803061811
-analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en
diff --git a/docs/org.eclipse.wst.command.env.doc.user/index/indexed_docs b/docs/org.eclipse.wst.command.env.doc.user/index/indexed_docs
deleted file mode 100644
index dc4e491..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,8 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 20:31:22 EDT 2008
-/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.html=0
-/org.eclipse.wst.command.env.doc.user/topics/twbwsa.html=0
-/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.html=0
-/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.html=0
-/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.html=0
-/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.html=0
diff --git a/docs/org.eclipse.wst.command.env.doc.user/index/segments b/docs/org.eclipse.wst.command.env.doc.user/index/segments
deleted file mode 100644
index 63e327d..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.command.env.doc.user/myplugin.xml b/docs/org.eclipse.wst.command.env.doc.user/myplugin.xml
deleted file mode 100644
index e1104d3..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/myplugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 20078 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<plugin>
- <extension
- point="org.eclipse.help.toc">
- <toc file="wsaxisant_toc.xml" />
- <index path="index/"/>
- </extension>
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.wst.command.env.doc.userindex.xml"/>
- </extension>
- <extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/org.eclipse.wst.command.env.doc.user.maplist b/docs/org.eclipse.wst.command.env.doc.user/org.eclipse.wst.command.env.doc.user.maplist
deleted file mode 100644
index 265f263..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/org.eclipse.wst.command.env.doc.user.maplist
+++ /dev/null
@@ -1,8 +0,0 @@
-<maplist version="3.6.2">
- <nav>
- <map file="wsaxisant_toc.ditamap"/>
- </nav>
- <link>
- <map file="wsaxisant_toc.ditamap"/>
- </link>
-</maplist>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/org.eclipse.wst.command.env.doc.userindex.xml b/docs/org.eclipse.wst.command.env.doc.user/org.eclipse.wst.command.env.doc.userindex.xml
deleted file mode 100644
index b9ec414..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/org.eclipse.wst.command.env.doc.userindex.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
- <entry keyword="Axis runtime environment">
- <entry keyword="Web services">
- <entry keyword="creating with Ant tasks">
- <topic href="topics/cwsaxisant.html#creatingawebservicefromajavabean" title="Creating Axis runtime environment Web services and clients using Web services Ant tasks"/>
- <topic href="topics/twbwsa.html#ttdwsa" title="Creating a Web service using Ant tasks in the Workbench"/>
- </entry>
- </entry>
- <entry keyword="skeleton Web services">
- <entry keyword="Ant task reference">
- <topic href="topics/rtdwsa.html#top-downaxiswebservicecommandlinereference" title="Top-down Axis Web service Ant task properties file reference"/>
- </entry>
- </entry>
- <entry keyword="java bean Web services">
- <entry keyword="Ant task reference">
- <topic href="topics/rbuwsa.html#bottom-upaxiswebservicecommandlinereference" title="Bottom-up Axis Web service Ant task properties file reference"/>
- </entry>
- </entry>
- <entry keyword="Web services client">
- <entry keyword="creating with Ant tasks">
- <topic href="topics/twbwsclienta.html#twsclienta" title="Creating a Web service client using Ant tasks"/>
- </entry>
- <entry keyword="Ant task reference">
- <topic href="topics/rwsclienta.html#axiswebserviceclientcommandlinereference" title="Axis Web service client Ant task properties file reference"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="Web services">
- <entry keyword="Axis runtime environment">
- <entry keyword="creating with Ant tasks">
- <topic href="topics/cwsaxisant.html#creatingawebservicefromajavabean" title="Creating Axis runtime environment Web services and clients using Web services Ant tasks"/>
- <topic href="topics/twbwsa.html#ttdwsa" title="Creating a Web service using Ant tasks in the Workbench"/>
- <topic href="topics/twbwsclienta.html#twsclienta" title="Creating a Web service client using Ant tasks"/>
- </entry>
- <entry keyword="Web services">
- <topic href="topics/twbwsa.html#ttdwsa" title="Creating a Web service using Ant tasks in the Workbench"/>
- </entry>
- <entry keyword="Ant task reference">
- <topic href="topics/rtdwsa.html#top-downaxiswebservicecommandlinereference" title="Top-down Axis Web service Ant task properties file reference"/>
- <topic href="topics/rbuwsa.html#bottom-upaxiswebservicecommandlinereference" title="Bottom-up Axis Web service Ant task properties file reference"/>
- <topic href="topics/rwsclienta.html#axiswebserviceclientcommandlinereference" title="Axis Web service client Ant task properties file reference"/>
- </entry>
- <entry keyword="skeleton Web services">
- <topic href="topics/rtdwsa.html#top-downaxiswebservicecommandlinereference" title="Top-down Axis Web service Ant task properties file reference"/>
- </entry>
- <entry keyword="java bean Web services">
- <topic href="topics/rbuwsa.html#bottom-upaxiswebservicecommandlinereference" title="Bottom-up Axis Web service Ant task properties file reference"/>
- </entry>
- <entry keyword="Web services client">
- <topic href="topics/twbwsclienta.html#twsclienta" title="Creating a Web service client using Ant tasks"/>
- <topic href="topics/rwsclienta.html#axiswebserviceclientcommandlinereference" title="Axis Web service client Ant task properties file reference"/>
- </entry>
- </entry>
- </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.doc.user/plugin.properties b/docs/org.eclipse.wst.command.env.doc.user/plugin.properties
deleted file mode 100644
index c5c2dac..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-pluginName = Web services Axis Ant task documentation
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.command.env.doc.user/plugin.xml b/docs/org.eclipse.wst.command.env.doc.user/plugin.xml
deleted file mode 100644
index e1104d3..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 20078 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<plugin>
- <extension
- point="org.eclipse.help.toc">
- <toc file="wsaxisant_toc.xml" />
- <index path="index/"/>
- </extension>
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.wst.command.env.doc.userindex.xml"/>
- </extension>
- <extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.dita b/docs/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.dita
deleted file mode 100644
index 521547e..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.dita
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="creatingawebservicefromajavabean" xml:lang="en-us">
-<title>Creating Axis runtime environment Web services and clients using Web
-services Ant tasks</title>
-<titlealts>
-<searchtitle>Creating Axis runtime environment Web services and clients using
-Ant tasks</searchtitle>
-</titlealts>
-<shortdesc>If you prefer not to use the Web service wizard, you can use Ant
-files to create Web services and clients using the Axis runtime environment.
-The Web services Ant tasks can be run in two ways: through the Eclipse workspace
-using <menucascade><uicontrol>Run As</uicontrol><uicontrol>Ant Build...</uicontrol>
-</menucascade>, or they can be run headless through the command line. Once
-you have created your Web service, you can then deploy it to a server, test
-it, and publish it as a business entity or business service.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Axis runtime environment<indexterm>Web services<indexterm>creating
-with Ant tasks</indexterm></indexterm></indexterm><indexterm>Web services<indexterm>Axis
-runtime environment<indexterm>creating with Ant tasks</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<section><title>Prerequisites</title><p>Before you create a Web service or
-client using the Ant tasks, you need to complete a few prerequisites.</p><ul>
-<li>Install Apache Tomcat, create a server, and create a dynamic Web project
-associated with that server as described in <xref href="../../org.eclipse.jst.ws.axis.ui.doc.user/topics/ttomcatserv.dita"
-scope="peer">Creating an Apache Tomcat server and Web project</xref></li>
-<li>Import the required Ant files into your workspace:<ol>
-<li>Create a project.</li>
-<li>Import the required Ant files. Select <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol><uicontrol>Web Services</uicontrol>
-<uicontrol>Ant Files</uicontrol><uicontrol>Next</uicontrol></menucascade>.</li>
-<li>Select the following:<ul>
-<li>Web service runtime</li>
-<li>Web service or client type</li>
-<li>Location into which the ant files will be generated</li>
-</ul>Click <uicontrol>Finish</uicontrol>.</li>
-</ol>Depending on the selections made on the previous panel, several files
-may be imported into this project:<ul>
-<li><i>runtime_servicetype</i>.xml - this is the Ant file.</li>
-<li><i>runtime_servicetype</i>.properties - this is a sample Ant properties
-file referenced by the Ant file. You can modify the properties in this file
-to generate a Web service.</li>
-</ul></li>
-<li>Create a dynamic Web project for the Web service or client.</li>
-</ul></section>
-<section><title>Creating a Web service or client</title><p>Once you've completed
-the prerequisites you can do the following:</p></section>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.html b/docs/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.html
deleted file mode 100644
index 7bdad54..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Creating Axis runtime environment Web services and clients using Web services Ant tasks" />
-<meta name="abstract" content="If you prefer not to use the Web service wizard, you can use Ant files to create Web services and clients using the Axis runtime environment. The Web services Ant tasks can be run in two ways: through the Eclipse workspace using Run As > Ant Build..., or they can be run headless through the command line. Once you have created your Web service, you can then deploy it to a server, test it, and publish it as a business entity or business service." />
-<meta name="description" content="If you prefer not to use the Web service wizard, you can use Ant files to create Web services and clients using the Axis runtime environment. The Web services Ant tasks can be run in two ways: through the Eclipse workspace using Run As > Ant Build..., or they can be run headless through the command line. Once you have created your Web service, you can then deploy it to a server, test it, and publish it as a business entity or business service." />
-<meta content="Axis runtime environment, Web services, creating with Ant tasks, Axis runtime environment, creating with Ant tasks" name="DC.subject" />
-<meta content="Axis runtime environment, Web services, creating with Ant tasks, Axis runtime environment, creating with Ant tasks" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twbwsa.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twbwsclienta.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="creatingawebservicefromajavabean" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Axis runtime environment Web services and clients using
-Ant tasks</title>
-</head>
-<body id="creatingawebservicefromajavabean"><a name="creatingawebservicefromajavabean"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Axis runtime environment Web services and clients using Web
-services Ant tasks</h1>
-
-
-
-
-<div><p>If you prefer not to use the Web service wizard, you can use Ant
-files to create Web services and clients using the Axis runtime environment.
-The Web services Ant tasks can be run in two ways: through the Eclipse workspace
-using <span class="menucascade"><span class="uicontrol">Run As</span> > <span class="uicontrol">Ant Build...</span>
-</span>, or they can be run headless through the command line. Once
-you have created your Web service, you can then deploy it to a server, test
-it, and publish it as a business entity or business service.</p>
-
-<div class="section"><h4 class="sectiontitle">Prerequisites</h4><p>Before you create a Web service or
-client using the Ant tasks, you need to complete a few prerequisites.</p>
-<ul>
-<li>Install Apache Tomcat, create a server, and create a dynamic Web project
-associated with that server as described in <a href="../../org.eclipse.jst.ws.axis.ui.doc.user/topics/ttomcatserv.html">Creating an Apache Tomcat server and Web project</a></li>
-
-<li>Import the required Ant files into your workspace:<ol>
-<li>Create a project.</li>
-
-<li>Import the required Ant files. Select <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span> > <span class="uicontrol">Web Services</span>
- > <span class="uicontrol">Ant Files</span> > <span class="uicontrol">Next</span></span>.</li>
-
-<li>Select the following:<ul>
-<li>Web service runtime</li>
-
-<li>Web service or client type</li>
-
-<li>Location into which the ant files will be generated</li>
-
-</ul>
-Click <span class="uicontrol">Finish</span>.</li>
-
-</ol>
-Depending on the selections made on the previous panel, several files
-may be imported into this project:<ul>
-<li><em>runtime_servicetype</em>.xml - this is the Ant file.</li>
-
-<li><em>runtime_servicetype</em>.properties - this is a sample Ant properties
-file referenced by the Ant file. You can modify the properties in this file
-to generate a Web service.</li>
-
-</ul>
-</li>
-
-<li>Create a dynamic Web project for the Web service or client.</li>
-
-</ul>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Creating a Web service or client</h4><p>Once you've completed
-the prerequisites you can do the following:</p>
-</div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/twbwsa.html">Creating a Web service using Ant tasks in the Workbench</a></strong><br />
-You can use Ant through the Eclipse workspace to generate a Web service using the Axis run-time environment. Both top-down and bottom-up Web services development is supported with the Ant tasks.</li>
-<li class="ulchildlink"><strong><a href="../topics/twbwsclienta.html">Creating a Web service client using Ant tasks</a></strong><br />
-If you have a WSDL file you can use Ant through the Eclipse workspace to generate a Web service client using the Axis run-time environment.</li>
-</ul>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.dita b/docs/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.dita
deleted file mode 100644
index a9a852f..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.dita
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="bottom-upaxiswebservicecommandlinereference" xml:lang="en-us">
-<title>Bottom-up Axis Web service Ant task properties file reference</title>
-<shortdesc>The <userinput>axis_bujava.properties</userinput> file is used
-to pass data to the Web services Ant tasks when creating an Axis Web service
-. This file shows the available options.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Axis runtime environment<indexterm>java bean Web services<indexterm>Ant
-task reference</indexterm></indexterm></indexterm><indexterm>Web services<indexterm>Axis
-runtime environment<indexterm>java bean Web services<indexterm>Ant task reference</indexterm></indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody>
-<section><title>Parameters</title><parml><plentry>
-<pt>ScenarioType</pt>
-<pd><synph> Options: <codeph>service</codeph> </synph></pd>
-<pd>This is a required element that tells the Ant task if it is creating a
-Web service or a Web service client.</pd>
-</plentry><plentry>
-<pt>InitialSelection</pt>
-<pd>Enter the workspace relative URI to the WSDL file or Java bean within
-your workspace. For example <userinput>/dynamicWebProjectName/WebContent/myService.wsdl</userinput> or <userinput>/dynamicWebProjectName/src/myBean.java</userinput
-></pd>
-</plentry><plentry>
-<pt>ListRuntimes</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>If <codeph>true</codeph> is selected, the list of valid runtime options
-will be provided when the Ant task is run.</pd>
-</plentry><plentry>
-<pt>ListServers</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>If <codeph>true</codeph> is selected, the list of valid server options
-will be provided when the Ant task is run.</pd>
-</plentry><plentry>
-<pt>Service.RuntimeId</pt>
-<pd>This is the ID of the Web service's runtime. This parameter should not
-be modified.</pd>
-</plentry><plentry>
-<pt>Service.ServerId</pt>
-<pd>Options:<sl>
-<sli><codeph>org.eclipse.jst.server.tomcat.x</codeph> (where <codeph>x</codeph> is <codeph>32,
-40, 41, 50,</codeph> or <codeph>55</codeph>)</sli>
-<sli><codeph>org.eclipse.jst.server.generic.weblogicx</codeph> (where <codeph>x</codeph> is <codeph>81</codeph> or <codeph>90</codeph>) </sli>
-<sli><codeph>org.eclipse.jst.server.generic.jbossx</codeph> (where <codeph>x</codeph> is <codeph>323</codeph> or <codeph>4</codeph>)</sli>
-<sli><codeph>org.eclipse.jst.server.generic.jonas4</codeph></sli>
-<sli><codeph>org.eclipse.jst.server.generic.oracle1013</codeph></sli>
-<sli><codeph>org.eclipse.jst.servers.websphere.6</codeph></sli>
-</sl></pd>
-<pd>This is the ID of the target server. Delete or comment out this parameter
-to have the Ant task select the correct value based on the server settings
-of the dynamic Web project.</pd>
-</plentry><plentry>
-<pt>ServiceProjectName</pt>
-<pd>By default the service project is given the name of the WSDL file or Java
-bean from which it is created. Use this parameter to create the service project
-with a different name.</pd>
-</plentry><plentry>
-<pt>ServiceEarProjectName</pt>
-<pd>By default the service EAR project is given the name of the WSDL file
-or Java bean from which it is created. Use this parameter to create the service
-EAR project with a different name.</pd>
-</plentry><plentry>
-<pt>Mappings</pt>
-<pd>Enter the workspace relative URI to a property file containing mappings.</pd>
-<pd>Mappings are used to override the default namespace names in the generated
-WSDL. The content of the properties file must be of the format package=namespace.
-You will need to escape some special characters in the properties files.
-For example <codeph>somePackage=http://someNamespace</codeph> should be <codeph>somePackage=http\://someNamespace</codeph>.
- Otherwise, the colon (:) would be treated as delimiter resulting in trying
-to map <codeph>somePackage</codeph> to <codeph>http</codeph>.</pd>
-</plentry><plentry>
-<pt>JavaOutput</pt>
-<pd>Enter the workspace relative URI to an existing Java source folder for
-the generated Java code.</pd>
-</plentry><plentry>
-<pt>Methods</pt>
-<pd>Use this parameter to limit which methods are exposed in the service.
-It must be in the form of a space delimited string of method signatures. For
-example, <userinput>method1(parmType1) method2(parmType2)</userinput>. If
-no list is provided, all methods are exposed. </pd>
-</plentry><plentry>
-<pt>Style</pt>
-<pd><synph> Options: <codeph>DOCUMENT</codeph> <codeph>RPC</codeph> <codeph>WRAPPED</codeph></synph></pd>
-<pd>Select the SOAP message style. The default is <codeph>DOCUMENT</codeph>.</pd>
-</plentry><plentry>
-<pt>Use</pt>
-<pd><synph> Options: <codeph>LITERAL</codeph> <codeph>ENCODED</codeph></synph></pd>
-<pd>Select if the SOAP message will be literal or encoded. The default is <codeph>LITERAL</codeph>.</pd>
-</plentry><plentry>
-<pt>OverwriteFilesEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to overwrite any file that it
-creates with the same name as an existing file. By default this is set to <codeph>true</codeph>.</pd>
-</plentry><plentry>
-<pt>CreateFoldersEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to create any neccessary folders.
-By default this is set to <codeph>true</codeph>.</pd>
-</plentry><plentry>
-<pt>CheckoutFilesEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to checkout files from CVS without
-prompting you. By default this is set to <codeph>true</codeph>.</pd>
-</plentry></parml></section>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.html b/docs/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.html
deleted file mode 100644
index 2bb0d17..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Bottom-up Axis Web service Ant task properties file reference" />
-<meta name="abstract" content="The axis_bujava.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service . This file shows the available options." />
-<meta name="description" content="The axis_bujava.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service . This file shows the available options." />
-<meta content="Axis runtime environment, java bean Web services, Ant task reference, Web services, Axis runtime environment, Ant task reference" name="DC.subject" />
-<meta content="Axis runtime environment, java bean Web services, Ant task reference, Web services, Axis runtime environment, Ant task reference" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twbwsa.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="bottom-upaxiswebservicecommandlinereference" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Bottom-up Axis Web service Ant task properties file reference</title>
-</head>
-<body id="bottom-upaxiswebservicecommandlinereference"><a name="bottom-upaxiswebservicecommandlinereference"><!-- --></a>
-
-
-<h1 class="topictitle1">Bottom-up Axis Web service Ant task properties file reference</h1>
-
-
-
-<div><p>The <kbd class="userinput">axis_bujava.properties</kbd> file is used
-to pass data to the Web services Ant tasks when creating an Axis Web service
-. This file shows the available options.</p>
-
-<div class="section"><h4 class="sectiontitle">Parameters</h4><dl>
-<dt class="dlterm">ScenarioType</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">service</samp> </span></dd>
-
-<dd class="ddexpand">This is a required element that tells the Ant task if it is creating a
-Web service or a Web service client.</dd>
-
-
-<dt class="dlterm">InitialSelection</dt>
-
-<dd>Enter the workspace relative URI to the WSDL file or Java bean within
-your workspace. For example <kbd class="userinput">/dynamicWebProjectName/WebContent/myService.wsdl</kbd> or <kbd class="userinput">/dynamicWebProjectName/src/myBean.java</kbd></dd>
-
-
-<dt class="dlterm">ListRuntimes</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid runtime options
-will be provided when the Ant task is run.</dd>
-
-
-<dt class="dlterm">ListServers</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid server options
-will be provided when the Ant task is run.</dd>
-
-
-<dt class="dlterm">Service.RuntimeId</dt>
-
-<dd>This is the ID of the Web service's runtime. This parameter should not
-be modified.</dd>
-
-
-<dt class="dlterm">Service.ServerId</dt>
-
-<dd>Options:<ul class="simple">
-<li><samp class="codeph">org.eclipse.jst.server.tomcat.x</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">32,
-40, 41, 50,</samp> or <samp class="codeph">55</samp>)</li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.weblogicx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">81</samp> or <samp class="codeph">90</samp>) </li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.jbossx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">323</samp> or <samp class="codeph">4</samp>)</li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.jonas4</samp></li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.oracle1013</samp></li>
-
-<li><samp class="codeph">org.eclipse.jst.servers.websphere.6</samp></li>
-
-</ul>
-</dd>
-
-<dd class="ddexpand">This is the ID of the target server. Delete or comment out this parameter
-to have the Ant task select the correct value based on the server settings
-of the dynamic Web project.</dd>
-
-
-<dt class="dlterm">ServiceProjectName</dt>
-
-<dd>By default the service project is given the name of the WSDL file or Java
-bean from which it is created. Use this parameter to create the service project
-with a different name.</dd>
-
-
-<dt class="dlterm">ServiceEarProjectName</dt>
-
-<dd>By default the service EAR project is given the name of the WSDL file
-or Java bean from which it is created. Use this parameter to create the service
-EAR project with a different name.</dd>
-
-
-<dt class="dlterm">Mappings</dt>
-
-<dd>Enter the workspace relative URI to a property file containing mappings.</dd>
-
-<dd class="ddexpand">Mappings are used to override the default namespace names in the generated
-WSDL. The content of the properties file must be of the format package=namespace.
-You will need to escape some special characters in the properties files.
-For example <samp class="codeph">somePackage=http://someNamespace</samp> should be <samp class="codeph">somePackage=http\://someNamespace</samp>.
- Otherwise, the colon (:) would be treated as delimiter resulting in trying
-to map <samp class="codeph">somePackage</samp> to <samp class="codeph">http</samp>.</dd>
-
-
-<dt class="dlterm">JavaOutput</dt>
-
-<dd>Enter the workspace relative URI to an existing Java source folder for
-the generated Java code.</dd>
-
-
-<dt class="dlterm">Methods</dt>
-
-<dd>Use this parameter to limit which methods are exposed in the service.
-It must be in the form of a space delimited string of method signatures. For
-example, <kbd class="userinput">method1(parmType1) method2(parmType2)</kbd>. If
-no list is provided, all methods are exposed. </dd>
-
-
-<dt class="dlterm">Style</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">DOCUMENT</samp> <samp class="codeph">RPC</samp> <samp class="codeph">WRAPPED</samp></span></dd>
-
-<dd class="ddexpand">Select the SOAP message style. The default is <samp class="codeph">DOCUMENT</samp>.</dd>
-
-
-<dt class="dlterm">Use</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">LITERAL</samp> <samp class="codeph">ENCODED</samp></span></dd>
-
-<dd class="ddexpand">Select if the SOAP message will be literal or encoded. The default is <samp class="codeph">LITERAL</samp>.</dd>
-
-
-<dt class="dlterm">OverwriteFilesEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to overwrite any file that it
-creates with the same name as an existing file. By default this is set to <samp class="codeph">true</samp>.</dd>
-
-
-<dt class="dlterm">CreateFoldersEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to create any neccessary folders.
-By default this is set to <samp class="codeph">true</samp>.</dd>
-
-
-<dt class="dlterm">CheckoutFilesEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to checkout files from CVS without
-prompting you. By default this is set to <samp class="codeph">true</samp>.</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twbwsa.html" title="You can use Ant through the Eclipse workspace to generate a Web service using the Axis run-time environment. Both top-down and bottom-up Web services development is supported with the Ant tasks.">Creating a Web service using Ant tasks in the Workbench</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.dita b/docs/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.dita
deleted file mode 100644
index 85ab002..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.dita
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="top-downaxiswebservicecommandlinereference" xml:lang="en-us">
-<title>Top-down Axis Web service Ant task properties file reference</title>
-<shortdesc>The <userinput>axis_tdjava.properties</userinput> file is used
-to pass data to the Web services Ant tasks when creating an Axis Web service
-. This file shows the available options.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Axis runtime environment<indexterm>skeleton Web services<indexterm>Ant
-task reference</indexterm></indexterm></indexterm><indexterm>Web services<indexterm>Axis
-runtime environment<indexterm>skeleton Web services<indexterm>Ant task reference</indexterm></indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody>
-<section><title>Parameters</title><parml><plentry>
-<pt>ScenarioType</pt>
-<pd><synph> Options: <codeph>service</codeph> </synph></pd>
-<pd>This is a required element that tells the Ant task if it is creating a
-Web service or a Web service client.</pd>
-</plentry><plentry>
-<pt>InitialSelection</pt>
-<pd>Enter the workspace relative URI to the WSDL file or Java bean within
-your workspace. For example <userinput>/dynamicWebProjectName/WebContent/myService.wsdl</userinput> or <userinput>/dynamicWebProjectName/src/myBean.java</userinput
-></pd>
-</plentry><plentry>
-<pt>ListRuntimes</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>If <codeph>true</codeph> is selected, the list of valid runtime options
-will be provided when the Ant task is run.</pd>
-</plentry><plentry>
-<pt>ListServers</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>If <codeph>true</codeph> is selected, the list of valid server options
-will be provided when the Ant task is run.</pd>
-</plentry><plentry>
-<pt>Service.RuntimeId</pt>
-<pd>This is the ID of the Web service's runtime. This parameter should not
-be modified.</pd>
-</plentry><plentry>
-<pt>Service.ServerId</pt>
-<pd>Options:<sl>
-<sli><codeph>org.eclipse.jst.server.tomcat.x</codeph> (where <codeph>x</codeph> is <codeph>32,
-40, 41, 50,</codeph> or <codeph>55</codeph>)</sli>
-<sli><codeph>org.eclipse.jst.server.generic.weblogicx</codeph> (where <codeph>x</codeph> is <codeph>81</codeph> or <codeph>90</codeph>) </sli>
-<sli><codeph>org.eclipse.jst.server.generic.jbossx</codeph> (where <codeph>x</codeph> is <codeph>323</codeph> or <codeph>4</codeph>)</sli>
-<sli><codeph>org.eclipse.jst.server.generic.jonas4</codeph></sli>
-<sli><codeph>org.eclipse.jst.server.generic.oracle1013</codeph></sli>
-<sli><codeph>org.eclipse.jst.servers.websphere.6</codeph></sli>
-</sl></pd>
-<pd>This is the ID of the target server. Delete or comment out this parameter
-to have the Ant task select the correct value based on the server settings
-of the dynamic Web project.</pd>
-</plentry><plentry>
-<pt>ServiceProjectName</pt>
-<pd>By default the service project is given the name of the WSDL file or Java
-bean from which it is created. Use this parameter to create the service project
-with a different name.</pd>
-</plentry><plentry>
-<pt>ServiceEarProjectName</pt>
-<pd>By default the service EAR project is given the name of the WSDL file
-or Java bean from which it is created. Use this parameter to create the service
-EAR project with a different name.</pd>
-</plentry><plentry>
-<pt>Mappings</pt>
-<pd>Enter the workspace relative URI to a property file containing mappings.</pd>
-<pd>Mappings are used to override the default package names of the generated
-Java template classes. The content of the properties file must be of the format
-namespace=package. You will need to escape some special characters in the
-properties files. For example <codeph>http://someNamespace=somePackage</codeph> should
-be <codeph>http\://someNamespace=somePackage</codeph>. Otherwise, the colon
-(:) would be treated as delimiter resulting in trying to map <codeph>http</codeph> to <codeph>//someNamespace=somePackage</codeph>.</pd>
-</plentry><plentry>
-<pt>JavaOutput</pt>
-<pd>Enter the workspace relative URI to an existing Java source folder for
-the generated Java code.</pd>
-</plentry><plentry>
-<pt>Methods</pt>
-<pd>Use this parameter to limit which methods are exposed in the service.
-It must be in the form of a space delimited string of method signatures. For
-example, <userinput>method1(parmType1) method2(parmType2)</userinput>. If
-no list is provided, all methods are exposed. </pd>
-</plentry><plentry>
-<pt>Style</pt>
-<pd><synph> Options: <codeph>DOCUMENT</codeph> <codeph>RPC</codeph> <codeph>WRAPPED</codeph></synph></pd>
-<pd>Select the SOAP message style. The default is <codeph>DOCUMENT</codeph>.</pd>
-</plentry><plentry>
-<pt>Use</pt>
-<pd><synph> Options: <codeph>LITERAL</codeph> <codeph>ENCODED</codeph></synph></pd>
-<pd>Select if the SOAP message will be literal or encoded. The default is <codeph>LITERAL</codeph>.</pd>
-</plentry><plentry>
-<pt>OverwriteFilesEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to overwrite any file that it
-creates with the same name as an existing file. By default this is set to <codeph>true</codeph>.</pd>
-</plentry><plentry>
-<pt>CreateFoldersEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to create any necessary folders.
-By default this is set to <codeph>true</codeph>.</pd>
-</plentry><plentry>
-<pt>CheckoutFilesEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to checkout files from CVS without
-prompting you. By default this is set to <codeph>true</codeph>.</pd>
-</plentry></parml></section>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.html b/docs/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.html
deleted file mode 100644
index 26bf109..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Top-down Axis Web service Ant task properties file reference" />
-<meta name="abstract" content="The axis_tdjava.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service . This file shows the available options." />
-<meta name="description" content="The axis_tdjava.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service . This file shows the available options." />
-<meta content="Axis runtime environment, skeleton Web services, Ant task reference, Web services, Axis runtime environment, Ant task reference" name="DC.subject" />
-<meta content="Axis runtime environment, skeleton Web services, Ant task reference, Web services, Axis runtime environment, Ant task reference" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twbwsa.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="top-downaxiswebservicecommandlinereference" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Top-down Axis Web service Ant task properties file reference</title>
-</head>
-<body id="top-downaxiswebservicecommandlinereference"><a name="top-downaxiswebservicecommandlinereference"><!-- --></a>
-
-
-<h1 class="topictitle1">Top-down Axis Web service Ant task properties file reference</h1>
-
-
-
-<div><p>The <kbd class="userinput">axis_tdjava.properties</kbd> file is used
-to pass data to the Web services Ant tasks when creating an Axis Web service
-. This file shows the available options.</p>
-
-<div class="section"><h4 class="sectiontitle">Parameters</h4><dl>
-<dt class="dlterm">ScenarioType</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">service</samp> </span></dd>
-
-<dd class="ddexpand">This is a required element that tells the Ant task if it is creating a
-Web service or a Web service client.</dd>
-
-
-<dt class="dlterm">InitialSelection</dt>
-
-<dd>Enter the workspace relative URI to the WSDL file or Java bean within
-your workspace. For example <kbd class="userinput">/dynamicWebProjectName/WebContent/myService.wsdl</kbd> or <kbd class="userinput">/dynamicWebProjectName/src/myBean.java</kbd></dd>
-
-
-<dt class="dlterm">ListRuntimes</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid runtime options
-will be provided when the Ant task is run.</dd>
-
-
-<dt class="dlterm">ListServers</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid server options
-will be provided when the Ant task is run.</dd>
-
-
-<dt class="dlterm">Service.RuntimeId</dt>
-
-<dd>This is the ID of the Web service's runtime. This parameter should not
-be modified.</dd>
-
-
-<dt class="dlterm">Service.ServerId</dt>
-
-<dd>Options:<ul class="simple">
-<li><samp class="codeph">org.eclipse.jst.server.tomcat.x</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">32,
-40, 41, 50,</samp> or <samp class="codeph">55</samp>)</li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.weblogicx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">81</samp> or <samp class="codeph">90</samp>) </li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.jbossx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">323</samp> or <samp class="codeph">4</samp>)</li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.jonas4</samp></li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.oracle1013</samp></li>
-
-<li><samp class="codeph">org.eclipse.jst.servers.websphere.6</samp></li>
-
-</ul>
-</dd>
-
-<dd class="ddexpand">This is the ID of the target server. Delete or comment out this parameter
-to have the Ant task select the correct value based on the server settings
-of the dynamic Web project.</dd>
-
-
-<dt class="dlterm">ServiceProjectName</dt>
-
-<dd>By default the service project is given the name of the WSDL file or Java
-bean from which it is created. Use this parameter to create the service project
-with a different name.</dd>
-
-
-<dt class="dlterm">ServiceEarProjectName</dt>
-
-<dd>By default the service EAR project is given the name of the WSDL file
-or Java bean from which it is created. Use this parameter to create the service
-EAR project with a different name.</dd>
-
-
-<dt class="dlterm">Mappings</dt>
-
-<dd>Enter the workspace relative URI to a property file containing mappings.</dd>
-
-<dd class="ddexpand">Mappings are used to override the default package names of the generated
-Java template classes. The content of the properties file must be of the format
-namespace=package. You will need to escape some special characters in the
-properties files. For example <samp class="codeph">http://someNamespace=somePackage</samp> should
-be <samp class="codeph">http\://someNamespace=somePackage</samp>. Otherwise, the colon
-(:) would be treated as delimiter resulting in trying to map <samp class="codeph">http</samp> to <samp class="codeph">//someNamespace=somePackage</samp>.</dd>
-
-
-<dt class="dlterm">JavaOutput</dt>
-
-<dd>Enter the workspace relative URI to an existing Java source folder for
-the generated Java code.</dd>
-
-
-<dt class="dlterm">Methods</dt>
-
-<dd>Use this parameter to limit which methods are exposed in the service.
-It must be in the form of a space delimited string of method signatures. For
-example, <kbd class="userinput">method1(parmType1) method2(parmType2)</kbd>. If
-no list is provided, all methods are exposed. </dd>
-
-
-<dt class="dlterm">Style</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">DOCUMENT</samp> <samp class="codeph">RPC</samp> <samp class="codeph">WRAPPED</samp></span></dd>
-
-<dd class="ddexpand">Select the SOAP message style. The default is <samp class="codeph">DOCUMENT</samp>.</dd>
-
-
-<dt class="dlterm">Use</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">LITERAL</samp> <samp class="codeph">ENCODED</samp></span></dd>
-
-<dd class="ddexpand">Select if the SOAP message will be literal or encoded. The default is <samp class="codeph">LITERAL</samp>.</dd>
-
-
-<dt class="dlterm">OverwriteFilesEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to overwrite any file that it
-creates with the same name as an existing file. By default this is set to <samp class="codeph">true</samp>.</dd>
-
-
-<dt class="dlterm">CreateFoldersEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to create any necessary folders.
-By default this is set to <samp class="codeph">true</samp>.</dd>
-
-
-<dt class="dlterm">CheckoutFilesEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to checkout files from CVS without
-prompting you. By default this is set to <samp class="codeph">true</samp>.</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twbwsa.html" title="You can use Ant through the Eclipse workspace to generate a Web service using the Axis run-time environment. Both top-down and bottom-up Web services development is supported with the Ant tasks.">Creating a Web service using Ant tasks in the Workbench</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.dita b/docs/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.dita
deleted file mode 100644
index b05c22b..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.dita
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="axiswebserviceclientcommandlinereference" xml:lang="en-us">
-<title>Axis Web service client Ant task properties file reference</title>
-<shortdesc>The <userinput>axis_client.properties</userinput> file is used
-to pass data to the Web services Ant tasks when creating an Axis Web service
-client. This file shows the available options.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Axis runtime environment<indexterm>Web services client<indexterm>Ant
-task reference</indexterm></indexterm></indexterm><indexterm>Web services<indexterm>Axis
-runtime environment<indexterm>Web services client<indexterm>Ant task reference</indexterm></indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody>
-<section><title>Parameters</title><parml><plentry>
-<pt>ScenarioType</pt>
-<pd><synph> Options: <codeph>client</codeph></synph></pd>
-<pd>This is a required element that tells the Ant task if it is creating a
-Web service or a Web service client.</pd>
-</plentry><plentry>
-<pt>InitialSelection</pt>
-<pd>Enter the workspace relative URI to the WSDL file or Java bean within
-your workspace. For example <userinput>/dynamicWebProjectName/WebContent/myService.wsdl</userinput> or <userinput>/dynamicWebProjectName/src/myBean.java</userinput
-></pd>
-</plentry><plentry>
-<pt>ListRuntimes</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>If <codeph>true</codeph> is selected, the list of valid runtime options
-will be provided when the Ant task is run.</pd>
-</plentry><plentry>
-<pt>ListServers</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>If <codeph>true</codeph> is selected, the list of valid server options
-will be provided when the Ant task is run.</pd>
-</plentry><plentry>
-<pt>Client.RuntimeId</pt>
-<pd>This is the ID of the Web service's runtime. This parameter should not
-be modified.</pd>
-</plentry><plentry>
-<pt>Client.ServerId</pt>
-<pd>Options:<sl>
-<sli><codeph>org.eclipse.jst.server.tomcat.x</codeph> (where <codeph>x</codeph> is <codeph>32,
-40, 41, 50,</codeph> or <codeph>55</codeph>)</sli>
-<sli><codeph>org.eclipse.jst.server.generic.weblogicx</codeph> (where <codeph>x</codeph> is <codeph>81</codeph> or <codeph>90</codeph>) </sli>
-<sli><codeph>org.eclipse.jst.server.generic.jbossx</codeph> (where <codeph>x</codeph> is <codeph>323</codeph> or <codeph>4</codeph>)</sli>
-<sli><codeph>org.eclipse.jst.server.generic.jonas4</codeph></sli>
-<sli><codeph>org.eclipse.jst.server.generic.oracle1013</codeph></sli>
-<sli><codeph>org.eclipse.jst.servers.websphere.6</codeph></sli>
-</sl></pd>
-<pd>This is the ID of the target server. Delete or comment out this parameter
-to have the Ant task select the correct value based on the server settings
-of the dynamic Web project.</pd>
-</plentry><plentry>
-<pt>ClientProjectName</pt>
-<pd>By default the client project is given the name of the WSDL file or Java
-bean from which it is created. Use this parameter to create the service project
-with a different name.</pd>
-</plentry><plentry>
-<pt>ClientEarProjectName</pt>
-<pd>By default the client EAR project is given the name of the WSDL file or
-Java bean from which it is created. Use this parameter to create the service
-EAR project with a different name.</pd>
-</plentry><plentry>
-<pt>ClientComponentType</pt>
-<pd><p>Options: <userinput>jst.web</userinput> <userinput>jst.java</userinput></p><p>Use
-this parameter to select the type of client project. The only valid client
-project type for Axis clients is <userinput>jst.web</userinput>.</p></pd>
-</plentry><plentry>
-<pt>CustomizeClientMappings</pt>
-<pd><p>Options: <userinput>true</userinput> <userinput>false</userinput></p><p>Mappings
-are used to override the default namespace names in the generated WSDL. The
-content of the properties file must be of the format namespace=package. You
-will need to escape some special characters in the properties files. For
-example <codeph>http://someNamespace=somePackage</codeph> should be <codeph>http\://someNamespace=somePackage</codeph>.
- Otherwise, the colon (:) would be treated as delimiter resulting in trying
-to map <codeph>http</codeph> to <codeph>//someNamespace=somePackage</codeph>.</p></pd>
-</plentry><plentry>
-<pt>Mappings</pt>
-<pd>Enter the workspace relative URI to a property file containing mappings. </pd>
-</plentry><plentry>
-<pt>OverwriteFilesEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to overwrite any file that it
-creates with the same name as an existing file. By default this is set to <codeph>true</codeph>.</pd>
-</plentry><plentry>
-<pt>CreateFoldersEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to create any neccessary folders.
-By default this is set to <codeph>true</codeph>.</pd>
-</plentry><plentry>
-<pt>CheckoutFilesEnabled</pt>
-<pd><synph> Options: <codeph>true</codeph> <codeph>false</codeph></synph></pd>
-<pd>Use this parameter to tell the Ant task to checkout files from CVS without
-prompting you. By default this is set to <codeph>true</codeph>.</pd>
-</plentry></parml></section>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.html b/docs/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.html
deleted file mode 100644
index 438e89c..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Axis Web service client Ant task properties file reference" />
-<meta name="abstract" content="The axis_client.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service client. This file shows the available options." />
-<meta name="description" content="The axis_client.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service client. This file shows the available options." />
-<meta content="Axis runtime environment, Web services client, Ant task reference, Web services, Axis runtime environment, Ant task reference" name="DC.subject" />
-<meta content="Axis runtime environment, Web services client, Ant task reference, Web services, Axis runtime environment, Ant task reference" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twbwsclienta.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="axiswebserviceclientcommandlinereference" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Axis Web service client Ant task properties file reference</title>
-</head>
-<body id="axiswebserviceclientcommandlinereference"><a name="axiswebserviceclientcommandlinereference"><!-- --></a>
-
-
-<h1 class="topictitle1">Axis Web service client Ant task properties file reference</h1>
-
-
-
-<div><p>The <kbd class="userinput">axis_client.properties</kbd> file is used
-to pass data to the Web services Ant tasks when creating an Axis Web service
-client. This file shows the available options.</p>
-
-<div class="section"><h4 class="sectiontitle">Parameters</h4><dl>
-<dt class="dlterm">ScenarioType</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">client</samp></span></dd>
-
-<dd class="ddexpand">This is a required element that tells the Ant task if it is creating a
-Web service or a Web service client.</dd>
-
-
-<dt class="dlterm">InitialSelection</dt>
-
-<dd>Enter the workspace relative URI to the WSDL file or Java bean within
-your workspace. For example <kbd class="userinput">/dynamicWebProjectName/WebContent/myService.wsdl</kbd> or <kbd class="userinput">/dynamicWebProjectName/src/myBean.java</kbd></dd>
-
-
-<dt class="dlterm">ListRuntimes</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid runtime options
-will be provided when the Ant task is run.</dd>
-
-
-<dt class="dlterm">ListServers</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid server options
-will be provided when the Ant task is run.</dd>
-
-
-<dt class="dlterm">Client.RuntimeId</dt>
-
-<dd>This is the ID of the Web service's runtime. This parameter should not
-be modified.</dd>
-
-
-<dt class="dlterm">Client.ServerId</dt>
-
-<dd>Options:<ul class="simple">
-<li><samp class="codeph">org.eclipse.jst.server.tomcat.x</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">32,
-40, 41, 50,</samp> or <samp class="codeph">55</samp>)</li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.weblogicx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">81</samp> or <samp class="codeph">90</samp>) </li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.jbossx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">323</samp> or <samp class="codeph">4</samp>)</li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.jonas4</samp></li>
-
-<li><samp class="codeph">org.eclipse.jst.server.generic.oracle1013</samp></li>
-
-<li><samp class="codeph">org.eclipse.jst.servers.websphere.6</samp></li>
-
-</ul>
-</dd>
-
-<dd class="ddexpand">This is the ID of the target server. Delete or comment out this parameter
-to have the Ant task select the correct value based on the server settings
-of the dynamic Web project.</dd>
-
-
-<dt class="dlterm">ClientProjectName</dt>
-
-<dd>By default the client project is given the name of the WSDL file or Java
-bean from which it is created. Use this parameter to create the service project
-with a different name.</dd>
-
-
-<dt class="dlterm">ClientEarProjectName</dt>
-
-<dd>By default the client EAR project is given the name of the WSDL file or
-Java bean from which it is created. Use this parameter to create the service
-EAR project with a different name.</dd>
-
-
-<dt class="dlterm">ClientComponentType</dt>
-
-<dd><p>Options: <kbd class="userinput">jst.web</kbd> <kbd class="userinput">jst.java</kbd></p>
-<p>Use
-this parameter to select the type of client project. The only valid client
-project type for Axis clients is <kbd class="userinput">jst.web</kbd>.</p>
-</dd>
-
-
-<dt class="dlterm">CustomizeClientMappings</dt>
-
-<dd><p>Options: <kbd class="userinput">true</kbd> <kbd class="userinput">false</kbd></p>
-<p>Mappings
-are used to override the default namespace names in the generated WSDL. The
-content of the properties file must be of the format namespace=package. You
-will need to escape some special characters in the properties files. For
-example <samp class="codeph">http://someNamespace=somePackage</samp> should be <samp class="codeph">http\://someNamespace=somePackage</samp>.
- Otherwise, the colon (:) would be treated as delimiter resulting in trying
-to map <samp class="codeph">http</samp> to <samp class="codeph">//someNamespace=somePackage</samp>.</p>
-</dd>
-
-
-<dt class="dlterm">Mappings</dt>
-
-<dd>Enter the workspace relative URI to a property file containing mappings. </dd>
-
-
-<dt class="dlterm">OverwriteFilesEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to overwrite any file that it
-creates with the same name as an existing file. By default this is set to <samp class="codeph">true</samp>.</dd>
-
-
-<dt class="dlterm">CreateFoldersEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to create any neccessary folders.
-By default this is set to <samp class="codeph">true</samp>.</dd>
-
-
-<dt class="dlterm">CheckoutFilesEnabled</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
-<dd class="ddexpand">Use this parameter to tell the Ant task to checkout files from CVS without
-prompting you. By default this is set to <samp class="codeph">true</samp>.</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twbwsclienta.html" title="If you have a WSDL file you can use Ant through the Eclipse workspace to generate a Web service client using the Axis run-time environment.">Creating a Web service client using Ant tasks</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsa.dita b/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsa.dita
deleted file mode 100644
index cf3e1e7..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsa.dita
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="ttdwsa" xml:lang="en-us">
-<title>Creating a Web service using Ant tasks in the Workbench</title>
-<titlealts>
-<searchtitle>Creating an Axis runtime Web service using Ant tasks in the Workbench</searchtitle>
-</titlealts>
-<shortdesc>You can use Ant through the Eclipse workspace to generate a Web
-service using the Axis run-time environment. Both top-down and bottom-up Web
-services development is supported with the Ant tasks.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Axis runtime environment<indexterm>Web services<indexterm>creating
-with Ant tasks</indexterm></indexterm></indexterm><indexterm>Web services<indexterm>Axis
-runtime environment<indexterm>Web services<indexterm>creating with Ant tasks</indexterm></indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq>Before creating the Web service you must:<ul>
-<li>complete the prerequisites listed in: <xref href="cwsaxisant.dita"></xref></li>
-<li>if you are creating a top-down Web service, create or import a WSDL file
-into the <userinput>WebContent</userinput> folder of the dynamic Web project
-you created.</li>
-<li>If you are creating a bottom-up Web service, create or import a Java bean
-into the <userinput>src</userinput> folder of the dynamic Web project.</li>
-</ul></prereq>
-<context>In order to create the Web service you need to modify the Ant file
-and the service Ant properties file.</context>
-<steps>
-<step><cmd>Edit the Ant file (<userinput>axis_tdjava.xml</userinput> or <userinput>axis_bujava.xml</userinput>)
-that you imported in the prerequisite steps. Ensure that it points to the
-service Ant properties file: it should contain a line stating <userinput><property
-file="axis_tdjava.properties"/></userinput> or <userinput><property file="axis_bujava.properties"/></userinput>.</cmd>
-<info>Save any changes that you have made.</info></step>
-<step><cmd>Edit the properties file that you imported in the prerequisite
-steps.</cmd>
-<substeps>
-<substep><cmd>Ensure that the scenarioType parameter is set to service.</cmd>
-</substep>
-<substep><cmd>Set the workspace parameter so that it points to the location
-of your WSDL file or Java bean.</cmd></substep>
-<substep><cmd>All other parameters are optional and should be deleted if not
-explicitly set. The default values for the remaining parameters will be retrieved
-from the dynamic project settings and preferences. For additional information
-on how to set these parameters refer to: </cmd><info><ul>
-<li><xref href="rtdwsa.dita"></xref></li>
-<li><xref href="rbuwsa.dita"></xref></li>
-</ul></info></substep>
-</substeps>
-<info>Save the properties file.</info></step>
-<step><cmd>Right-click <userinput>axis_tdjava.xml</userinput> or <userinput>axis_bujava.xml</userinput> and
-select <menucascade><uicontrol>Run As</uicontrol><uicontrol>Ant Build...</uicontrol>
-</menucascade></cmd></step>
-<step><cmd>In the dialog that opens, select the <uicontrol>JRE</uicontrol> tab
-and select <uicontrol>Run in the same JRE as the workspace</uicontrol>.</cmd>
-<info>Click <uicontrol>Apply</uicontrol> and then click <uicontrol>Run</uicontrol>.</info>
-</step>
-<step><cmd>Once your Web service has been generated the console displays a <userinput>Build
-Successful</userinput> message.</cmd></step>
-</steps>
-<result>The WSDL file for the service will have been created and placed in
-the dynamic Web project's WebContent\wsdl folder. The following files will
-have been created and placed in a subdirectory of the dynamic Web project's
-WebContent\WEB-INF folder:<ul>
-<li>web.xml</li>
-<li>undeploy.wsdd</li>
-<li>deploy.wsdd </li>
-</ul>If you are creating a top-down Web service, Web service files similar
-to the following ones will be created and placed under the dynamic Web project's
-src folder. Depending on the WSDL file on which the Web service is based,
-the files for your Web service may be different:<ul>
-<li><i>Service_name</i>_PortType.java</li>
-<li><i>Service_name</i>_Service.java</li>
-<li><i>Service_name</i>_ServiceLocator.java</li>
-<li><i>Service_name</i>SOAPImpl.java</li>
-<li><i>Service_name</i>SOAPSkeleton.java</li>
-<li><i>Service_name</i>SOAPStub.java</li>
-</ul> </result>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsa.html b/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsa.html
deleted file mode 100644
index a932491..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsa.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a Web service using Ant tasks in the Workbench" />
-<meta name="abstract" content="You can use Ant through the Eclipse workspace to generate a Web service using the Axis run-time environment. Both top-down and bottom-up Web services development is supported with the Ant tasks." />
-<meta name="description" content="You can use Ant through the Eclipse workspace to generate a Web service using the Axis run-time environment. Both top-down and bottom-up Web services development is supported with the Ant tasks." />
-<meta content="Axis runtime environment, Web services, creating with Ant tasks, Axis runtime environment, creating with Ant tasks" name="DC.subject" />
-<meta content="Axis runtime environment, Web services, creating with Ant tasks, Axis runtime environment, creating with Ant tasks" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwsaxisant.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtdwsa.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rbuwsa.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ttdwsa" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an Axis runtime Web service using Ant tasks in the Workbench</title>
-</head>
-<body id="ttdwsa"><a name="ttdwsa"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a Web service using Ant tasks in the Workbench</h1>
-
-
-
-
-<div><p>You can use Ant through the Eclipse workspace to generate a Web
-service using the Axis run-time environment. Both top-down and bottom-up Web
-services development is supported with the Ant tasks.</p>
-
-<div class="p">Before creating the Web service you must:<ul>
-<li>complete the prerequisites listed in: <a href="cwsaxisant.html" title="If you prefer not to use the Web service wizard, you can use Ant files to create Web services and clients using the Axis runtime environment. The Web services Ant tasks can be run in two ways: through the Eclipse workspace using Run As > Ant Build..., or they can be run headless through the command line. Once you have created your Web service, you can then deploy it to a server, test it, and publish it as a business entity or business service.">Creating Axis runtime environment Web services and clients using Web services Ant tasks</a></li>
-
-<li>if you are creating a top-down Web service, create or import a WSDL file
-into the <kbd class="userinput">WebContent</kbd> folder of the dynamic Web project
-you created.</li>
-
-<li>If you are creating a bottom-up Web service, create or import a Java bean
-into the <kbd class="userinput">src</kbd> folder of the dynamic Web project.</li>
-
-</ul>
-</div>
-
-<div class="section">In order to create the Web service you need to modify the Ant file
-and the service Ant properties file.</div>
-
-<ol>
-<li class="stepexpand"><span>Edit the Ant file (<kbd class="userinput">axis_tdjava.xml</kbd> or <kbd class="userinput">axis_bujava.xml</kbd>)
-that you imported in the prerequisite steps. Ensure that it points to the
-service Ant properties file: it should contain a line stating <kbd class="userinput"><property
-file="axis_tdjava.properties"/></kbd> or <kbd class="userinput"><property file="axis_bujava.properties"/></kbd>.</span>
- Save any changes that you have made.</li>
-
-<li class="stepexpand"><span>Edit the properties file that you imported in the prerequisite
-steps.</span>
-<ol type="a">
-<li class="substepexpand"><span>Ensure that the scenarioType parameter is set to service.</span>
-</li>
-
-<li class="substepexpand"><span>Set the workspace parameter so that it points to the location
-of your WSDL file or Java bean.</span></li>
-
-<li class="substepexpand"><span>All other parameters are optional and should be deleted if not
-explicitly set. The default values for the remaining parameters will be retrieved
-from the dynamic project settings and preferences. For additional information
-on how to set these parameters refer to: </span> <ul>
-<li><a href="rtdwsa.html" title="The axis_tdjava.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service . This file shows the available options.">Top-down Axis Web service Ant task properties file reference</a></li>
-
-<li><a href="rbuwsa.html" title="The axis_bujava.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service . This file shows the available options.">Bottom-up Axis Web service Ant task properties file reference</a></li>
-
-</ul>
-</li>
-
-</ol>
-
- Save the properties file.</li>
-
-<li class="stepexpand"><span>Right-click <kbd class="userinput">axis_tdjava.xml</kbd> or <kbd class="userinput">axis_bujava.xml</kbd> and
-select <span class="menucascade"><span class="uicontrol">Run As</span> > <span class="uicontrol">Ant Build...</span>
-</span></span></li>
-
-<li class="stepexpand"><span>In the dialog that opens, select the <span class="uicontrol">JRE</span> tab
-and select <span class="uicontrol">Run in the same JRE as the workspace</span>.</span>
- Click <span class="uicontrol">Apply</span> and then click <span class="uicontrol">Run</span>.
-</li>
-
-<li class="stepexpand"><span>Once your Web service has been generated the console displays a <kbd class="userinput">Build
-Successful</kbd> message.</span></li>
-
-</ol>
-
-<div class="section">The WSDL file for the service will have been created and placed in
-the dynamic Web project's WebContent\wsdl folder. The following files will
-have been created and placed in a subdirectory of the dynamic Web project's
-WebContent\WEB-INF folder:<ul>
-<li>web.xml</li>
-
-<li>undeploy.wsdd</li>
-
-<li>deploy.wsdd </li>
-
-</ul>
-If you are creating a top-down Web service, Web service files similar
-to the following ones will be created and placed under the dynamic Web project's
-src folder. Depending on the WSDL file on which the Web service is based,
-the files for your Web service may be different:<ul>
-<li><em>Service_name</em>_PortType.java</li>
-
-<li><em>Service_name</em>_Service.java</li>
-
-<li><em>Service_name</em>_ServiceLocator.java</li>
-
-<li><em>Service_name</em>SOAPImpl.java</li>
-
-<li><em>Service_name</em>SOAPSkeleton.java</li>
-
-<li><em>Service_name</em>SOAPStub.java</li>
-
-</ul>
- </div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/rtdwsa.html">Top-down Axis Web service Ant task properties file reference</a></strong><br />
-The axis_tdjava.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service . This file shows the available options.</li>
-<li class="ulchildlink"><strong><a href="../topics/rbuwsa.html">Bottom-up Axis Web service Ant task properties file reference</a></strong><br />
-The axis_bujava.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service . This file shows the available options.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cwsaxisant.html" title="If you prefer not to use the Web service wizard, you can use Ant files to create Web services and clients using the Axis runtime environment. The Web services Ant tasks can be run in two ways: through the Eclipse workspace using Run As > Ant Build..., or they can be run headless through the command line. Once you have created your Web service, you can then deploy it to a server, test it, and publish it as a business entity or business service.">Creating Axis runtime environment Web services and clients using Web services Ant tasks</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.dita b/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.dita
deleted file mode 100644
index 61a54f6..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.dita
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="twsclienta" xml:lang="en-us">
-<title>Creating a Web service client using Ant tasks</title>
-<titlealts>
-<searchtitle>Creating an Axis runtime Web service client from a WSDL file
-using command line tools</searchtitle>
-</titlealts>
-<shortdesc>If you have a WSDL file you can use Ant through the Eclipse workspace
-to generate a Web service client using the Axis run-time environment.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Axis runtime environment<indexterm>Web services client<indexterm>creating
-with Ant tasks</indexterm></indexterm></indexterm><indexterm>Web services<indexterm>Axis
-runtime environment<indexterm>Web services client<indexterm>creating with
-Ant tasks</indexterm></indexterm></indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<prereq>Before creating the Web service client you must:<ul>
-<li>complete the prerequisites listed in: <xref href="cwsaxisant.dita"></xref></li>
-<li>create or import a WSDL file into the dynamic Web project you created.</li>
-</ul></prereq>
-<context>In order to create the Web service client you need to modify the
-Ant file and the Ant properties file.</context>
-<steps>
-<step><cmd>Edit the Ant file (<userinput>axis_client.xml</userinput>) that
-you imported in the prerequisite steps. Ensure that it points to the client
-Ant properties file: it should contain a line stating <userinput><property
-file="axis_client.properties"/></userinput>.</cmd><info>Save any changes that
-you have made.</info></step>
-<step><cmd>Edit the <userinput>axis_client.properties</userinput> file that
-you imported in the prerequisite steps.</cmd>
-<substeps>
-<substep><cmd>Ensure that the scenarioType parameter is set to client.</cmd>
-</substep>
-<substep><cmd>Set the workspace parameter so that it points to the location
-of your WSDL file.</cmd></substep>
-<substep><cmd>All other parameters are optional and should be deleted if not
-explicitly set. The default values for the remaining parameters will be retrieved
-from the dynamic project settings. For additional information on how to set
-these parameters refer to: <xref href="rwsclienta.dita"></xref></cmd></substep>
-</substeps>
-<info>Save the <userinput>axis_client.properties</userinput> file.</info>
-</step>
-<step><cmd>Right-click <userinput>axis_client.xml</userinput> and select <menucascade>
-<uicontrol>Run As</uicontrol><uicontrol>Ant Build...</uicontrol></menucascade></cmd>
-</step>
-<step><cmd>In the dialog that opens, select the <uicontrol>JRE</uicontrol> tab
-and select <uicontrol>Run in the same JRE as the workspace</uicontrol>.</cmd>
-<info>Click <uicontrol>Apply</uicontrol> and then click <uicontrol>Run</uicontrol>.</info>
-</step>
-<step><cmd>Once your Web service has been generated the console displays a <userinput>Build
-Successful</userinput> message.</cmd></step>
-</steps>
-<result>The following files will have been created and placed in the dynamic
-Web project's WebContent\wsdl folder:<ul>
-<li><i>Service_name</i>SOAP.wsdl </li>
-</ul>The following files will have been created and placed in the dynamic
-Web project's WebContent\WEB-INF folder:<ul>
-<li>undeploy.wsdd</li>
-<li>deploy.wsdd </li>
-</ul>The following files will have been created and placed under the dynamic
-Web project's src folder. Depending on the WSDL file on which the Web service
-client is based, the files for your Web service client may be different:<ul>
-<li><i>Service_name</i>Proxy.java</li>
-<li>get<i>Service_name</i>.java</li>
-<li>get<i>Service_name</i>Locator.java</li>
-<li>get<i>Service_name</i>Soap.java</li>
-<li>get<i>Service_name</i>SoapProxy.java</li>
-<li>get<i>Service_name</i>SoapStub.java</li>
-</ul> </result>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.html b/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.html
deleted file mode 100644
index 90ebdb0..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a Web service client using Ant tasks" />
-<meta name="abstract" content="If you have a WSDL file you can use Ant through the Eclipse workspace to generate a Web service client using the Axis run-time environment." />
-<meta name="description" content="If you have a WSDL file you can use Ant through the Eclipse workspace to generate a Web service client using the Axis run-time environment." />
-<meta content="Axis runtime environment, Web services client, creating with Ant tasks, Web services, Axis runtime environment, creating with Ant tasks" name="DC.subject" />
-<meta content="Axis runtime environment, Web services client, creating with Ant tasks, Web services, Axis runtime environment, creating with Ant tasks" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwsaxisant.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rwsclienta.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twsclienta" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an Axis runtime Web service client from a WSDL file
-using command line tools</title>
-</head>
-<body id="twsclienta"><a name="twsclienta"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a Web service client using Ant tasks</h1>
-
-
-
-
-<div><p>If you have a WSDL file you can use Ant through the Eclipse workspace
-to generate a Web service client using the Axis run-time environment.</p>
-
-<div class="p">Before creating the Web service client you must:<ul>
-<li>complete the prerequisites listed in: <a href="cwsaxisant.html" title="If you prefer not to use the Web service wizard, you can use Ant files to create Web services and clients using the Axis runtime environment. The Web services Ant tasks can be run in two ways: through the Eclipse workspace using Run As > Ant Build..., or they can be run headless through the command line. Once you have created your Web service, you can then deploy it to a server, test it, and publish it as a business entity or business service.">Creating Axis runtime environment Web services and clients using Web services Ant tasks</a></li>
-
-<li>create or import a WSDL file into the dynamic Web project you created.</li>
-
-</ul>
-</div>
-
-<div class="section">In order to create the Web service client you need to modify the
-Ant file and the Ant properties file.</div>
-
-<ol>
-<li class="stepexpand"><span>Edit the Ant file (<kbd class="userinput">axis_client.xml</kbd>) that
-you imported in the prerequisite steps. Ensure that it points to the client
-Ant properties file: it should contain a line stating <kbd class="userinput"><property
-file="axis_client.properties"/></kbd>.</span> Save any changes that
-you have made.</li>
-
-<li class="stepexpand"><span>Edit the <kbd class="userinput">axis_client.properties</kbd> file that
-you imported in the prerequisite steps.</span>
-<ol type="a">
-<li><span>Ensure that the scenarioType parameter is set to client.</span>
-</li>
-
-<li><span>Set the workspace parameter so that it points to the location
-of your WSDL file.</span></li>
-
-<li><span>All other parameters are optional and should be deleted if not
-explicitly set. The default values for the remaining parameters will be retrieved
-from the dynamic project settings. For additional information on how to set
-these parameters refer to: <a href="rwsclienta.html" title="The axis_client.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service client. This file shows the available options.">Axis Web service client Ant task properties file reference</a></span></li>
-
-</ol>
-
- Save the <kbd class="userinput">axis_client.properties</kbd> file.
-</li>
-
-<li class="stepexpand"><span>Right-click <kbd class="userinput">axis_client.xml</kbd> and select <span class="menucascade">
-<span class="uicontrol">Run As</span> > <span class="uicontrol">Ant Build...</span></span></span>
-</li>
-
-<li class="stepexpand"><span>In the dialog that opens, select the <span class="uicontrol">JRE</span> tab
-and select <span class="uicontrol">Run in the same JRE as the workspace</span>.</span>
- Click <span class="uicontrol">Apply</span> and then click <span class="uicontrol">Run</span>.
-</li>
-
-<li class="stepexpand"><span>Once your Web service has been generated the console displays a <kbd class="userinput">Build
-Successful</kbd> message.</span></li>
-
-</ol>
-
-<div class="section">The following files will have been created and placed in the dynamic
-Web project's WebContent\wsdl folder:<ul>
-<li><em>Service_name</em>SOAP.wsdl </li>
-
-</ul>
-The following files will have been created and placed in the dynamic
-Web project's WebContent\WEB-INF folder:<ul>
-<li>undeploy.wsdd</li>
-
-<li>deploy.wsdd </li>
-
-</ul>
-The following files will have been created and placed under the dynamic
-Web project's src folder. Depending on the WSDL file on which the Web service
-client is based, the files for your Web service client may be different:<ul>
-<li><em>Service_name</em>Proxy.java</li>
-
-<li>get<em>Service_name</em>.java</li>
-
-<li>get<em>Service_name</em>Locator.java</li>
-
-<li>get<em>Service_name</em>Soap.java</li>
-
-<li>get<em>Service_name</em>SoapProxy.java</li>
-
-<li>get<em>Service_name</em>SoapStub.java</li>
-
-</ul>
- </div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/rwsclienta.html">Axis Web service client Ant task properties file reference</a></strong><br />
-The axis_client.properties file is used to pass data to the Web services Ant tasks when creating an Axis Web service client. This file shows the available options.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cwsaxisant.html" title="If you prefer not to use the Web service wizard, you can use Ant files to create Web services and clients using the Axis runtime environment. The Web services Ant tasks can be run in two ways: through the Eclipse workspace using Run As > Ant Build..., or they can be run headless through the command line. Once you have created your Web service, you can then deploy it to a server, test it, and publish it as a business entity or business service.">Creating Axis runtime environment Web services and clients using Web services Ant tasks</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.doc.user/wsaxisant_toc.ditamap b/docs/org.eclipse.wst.command.env.doc.user/wsaxisant_toc.ditamap
deleted file mode 100644
index 256bfee..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/wsaxisant_toc.ditamap
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map anchorref="../org.eclipse.jst.ws.doc.user/webservice_toc.ditamap#wsaxisant"
-id="wsaxisant" title="wsaxisant">
-<topicref href="topics/cwsaxisant.dita" navtitle="Creating Axis runtime Web services using Ant tasks">
-<topicref href="topics/twbwsa.dita" navtitle="Creating a Web service using Ant tasks in the Workbench">
-<topicref href="topics/rtdwsa.dita" navtitle="Top-down Axis Web service Ant file reference">
-</topicref>
-<topicref href="topics/rbuwsa.dita" navtitle="Bottom-up Axis Web service Ant file reference">
-</topicref>
-</topicref>
-<topicref href="topics/twbwsclienta.dita" navtitle="Creating a Web service client using Ant tasks in the Workbench">
-<topicref href="topics/rwsclienta.dita" navtitle="Axis Web service client Ant file reference">
-</topicref>
-</topicref>
-</topicref>
-</map>
diff --git a/docs/org.eclipse.wst.command.env.doc.user/wsaxisant_toc.xml b/docs/org.eclipse.wst.command.env.doc.user/wsaxisant_toc.xml
deleted file mode 100644
index a3d8ac6..0000000
--- a/docs/org.eclipse.wst.command.env.doc.user/wsaxisant_toc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wsaxisant" label="wsaxisant" topic="topics/cwsaxisant.html">
-<topic label="Creating Axis runtime environment Web services and clients using Web services Ant tasks" href="topics/cwsaxisant.html">
-<topic label="Creating a Web service using Ant tasks in the Workbench" href="topics/twbwsa.html">
-<topic label="Top-down Axis Web service Ant task properties file reference" href="topics/rtdwsa.html"/>
-<topic label="Bottom-up Axis Web service Ant task properties file reference" href="topics/rbuwsa.html"/>
-</topic>
-<topic label="Creating a Web service client using Ant tasks" href="topics/twbwsclienta.html">
-<topic label="Axis Web service client Ant task properties file reference" href="topics/rwsclienta.html"/>
-</topic>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.command.env.infopop/.cvsignore b/docs/org.eclipse.wst.command.env.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.command.env.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.command.env.infopop/.project b/docs/org.eclipse.wst.command.env.infopop/.project
deleted file mode 100644
index 71b83fe..0000000
--- a/docs/org.eclipse.wst.command.env.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.command.env.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.command.env.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.command.env.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 53b6372..0000000
--- a/docs/org.eclipse.wst.command.env.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.command.env.infopop; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/docs/org.eclipse.wst.command.env.infopop/about.html b/docs/org.eclipse.wst.command.env.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.command.env.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.command.env.infopop/build.properties b/docs/org.eclipse.wst.command.env.infopop/build.properties
deleted file mode 100644
index db16674..0000000
--- a/docs/org.eclipse.wst.command.env.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = about.html,\
- plugin.xml,\
- wst-command-f1.xml,\
- META-INF/,\
- plugin.properties
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.infopop/plugin.properties b/docs/org.eclipse.wst.command.env.infopop/plugin.properties
deleted file mode 100644
index 14eef62..0000000
--- a/docs/org.eclipse.wst.command.env.infopop/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-! plug-in properties
-pluginName = Web services UI
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.infopop/plugin.xml b/docs/org.eclipse.wst.command.env.infopop/plugin.xml
deleted file mode 100644
index 7870c05..0000000
--- a/docs/org.eclipse.wst.command.env.infopop/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
- <extension point="org.eclipse.help.contexts">
- <contexts file="wst-command-f1.xml" plugin="org.eclipse.wst.command.env.ui"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.command.env.infopop/wst-command-f1.xml b/docs/org.eclipse.wst.command.env.infopop/wst-command-f1.xml
deleted file mode 100644
index 0c63c64..0000000
--- a/docs/org.eclipse.wst.command.env.infopop/wst-command-f1.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<contexts>
-
-<!--org.eclipse.wst.command.env.ui-->
-<context id="PPAD0001">
-<!--Action Dialogs Preference Page-->
-<description>You can use this page to choose which Web services popup actions are displayed or hidden. When using the Web services wizards launced from a popup menu you may see a check box that gives you the option of hiding the popup action that you have just performed. If you select that checkbox it will select the respective checkbox on this preference page. If you have chosen to hide a popup action that you want to display use this page to make the popup action visible.
-</description>
-</context>
-
-<context id="PPAD0002">
-<!--show all check box on the Action Dialogs Preference Page-->
-<description>By selecting this checkbox, all valid Web services popup actions will be displayed when you select a file in your workspace and right-click it. Alternately you can select to display or hide individual popup actions.
-</description>
-</context>
-
-<context id="PPAD0003">
-<!--hide all check box on the Action Dialogs Preference Page-->
-<description>By selecting this checkbox, all Web services popup actions will be hidden when you select a file in your workspace and right-click it. Alternately you can select to display or hide individual popup actions.
-</description>
-</context>
-
-<context id="TWP0001">
-<!--show/hide check box-->
-<description>When using the Web services wizards launced from a popup menu, this check box that gives you the option of hiding the popup action that you have just performed. If you select the checkbox it will select the respective checkbox on the Web services > Popup Dialog Selection preference page. If you have chosen to hide a popup action that you want to display, go to Window > Preferences > Web services > Popup Dialog Selection, and use this page to make the popup action visible.
-</description>
-</context>
-
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore b/docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore
deleted file mode 100644
index 77adf97..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-org.eclipse.wst.wsdl.ui.doc.user_1.0.0.jar
-build.xml
-bak
-temp
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/.project b/docs/org.eclipse.wst.wsdl.ui.doc.user/.project
deleted file mode 100644
index 2785100..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.wsdl.ui.doc.user</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.wsdl.ui.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index c9c2647..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 16 18:01:25 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.wsdl.ui.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 54ec5d8..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 18:01:32 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/DocBuild.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/DocBuild.xml
deleted file mode 100644
index 29d08bc..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
- This script build the Help plug-in by transforming the DITA source files into HTML.
-
- To use this script, you must install DITA-OT on your machine in the directory
- defined by the dita.ot.dir property.
-
- Run the default target after you edit the DITA source files to regenerate the HTML.
-
- To customize this script for other Help plug-ins, modify the value of the args.input property
- to be the DITA map file for the plug-in.
-
- NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
- output directory structure will be shifted incorrectly.
-
- NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
- will be copied over the generated plugin.xml which is currently not being generated correctly
- by DITA-OT.
-
- ChangeLog:
- 2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
- - Created.
- 2008-01-09 Kate Price <katep@ca.ibm.com>
- - modified for new DITA-OT version
- 2008-05-05 Kate Price <katep@ca.ibm.com>
- - modified to add generation of pre-built help index.
- - Must delete /index folder before running build
-
--->
-<project name="eclipsehelp" default="all">
-
- <property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
- <path id="dost.class.path">
- <pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
- </path>
-
- <taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
- <classpath refid="dost.class.path" />
- </taskdef>
- <target name="all" depends="integrate, eclipsehelp">
- </target>
- <target name="integrate">
- <integrate ditadir="${dita.ot.dir}" />
- </target>
-
- <!-- revise below here -->
- <target name="eclipsehelp">
- <ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
- <property name="args.copycss" value="no" />
- <property name="args.csspath" value="../org.eclipse.wst.doc.user" />
- <property name="args.eclipse.provider" value="Eclipse.org" />
- <property name="args.eclipse.version" value="3.3.0" />
- <property name="args.input" location="wsdl_build_toc.ditamap" />
- <property name="clean.temp" value="true" />
- <property name="dita.extname" value=".dita" />
- <property name="dita.temp.dir" location="temp" />
- <property name="output.dir" location="" />
- <property name="transtype" value="eclipsehelp" />
- </ant>
- <copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
- </target>
- <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-</project>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 487d10b..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.wsdl.ui.doc.user; singleton:=true
-Bundle-Version: 1.0.401.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/about.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties b/docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties
deleted file mode 100644
index a701682..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-bin.includes = wswsdleditorc_toc.xml,\
- wswsdleditort_toc.xml,\
- about.html,\
- org.eclipse.wst.wsdl.ui.doc.userindex.xml,\
- images/,\
- plugin.properties,\
- plugin.xml,\
- concepts/*.htm*,\
- tasks/*.htm*,\
- index/,\
- META-INF/
-src.includes = build.properties,\
- *.maplist,\
- *.ditamap,\
- concepts/*.dita,\
- tasks/*.dita
-bin.excludes = DocBuild.xml,\
- myPlugin*.xml
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.dita
deleted file mode 100644
index e4a1be5..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cwsdled" xml:lang="en-us">
-<title>Editing WSDL files with the WSDL Editor</title>
-<titlealts>
-<searchtitle>Editing WSDL files with the WSDL editor</searchtitle>
-</titlealts>
-<shortdesc>The WSDL editor allows you to easily and graphically create, modify,
-view, and validate WSDL files.</shortdesc>
-<conbody>
-<p>Using the WSDL editor, you can do the following:</p>
-<ul>
-<li>Create new WSDL files</li>
-<li>Validate and edit WSDL files</li>
-<li>Create and delete: <ul>
-<li>Services: used to aggregate a set of related ports. These are the root
-elements of all WSDL files.</li>
-<li>Ports: specify an address for a binding, thus defining a single communication
-endpoint.</li>
-<li>Bindings: specify concrete protocol and data format specifications for
-the operations and messages defined by a particular port type.</li>
-<li>Port types: a set of abstract operations that each refer to an input message
-and output messages.</li>
-<li>Operations: input and output messages.</li>
-<li>Messages: represent an abstract definition of the data being transmitted.
-A message consists of logical parts, each of which is associated with a definition
-within some type system.</li>
-<li>Parts: a flexible mechanism for describing the logical abstract content
-of a message.<?Pub Caret?></li>
-<li>Types: describe all the data types used between the client and server.
-WSDL is not tied exclusively to a specific typing system, but it uses the
-W3C XML Schema specification as its default choice.</li>
-<li>Import statements: used to associate a namespace with a document location. </li>
-</ul></li>
-<li>Import existing WSDL files for structured viewing</li>
-<li>Generate documentation from a WSDL document.</li>
-</ul>
-<p>The WSDL support in the WSDL editor is based on the W3C <xref format="html"
-href="http://www.w3.org/TR/wsdl" scope="external">Web Services Description
-Language (WSDL) 1.1</xref>. The WSDL specification from the W3C Web site is
-also used for validation. </p>
-</conbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.dita" scope="peer">
-<linktext>WSDL</linktext></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="../tasks/tcrtwsdl.dita" scope="local"></link>
-<link href="../tasks/tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</concept>
-<?Pub *0000002534?>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html
deleted file mode 100644
index a191577..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Editing WSDL files with the WSDL Editor" />
-<meta name="abstract" content="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files." />
-<meta name="description" content="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files." />
-<meta scheme="URI" name="DC.Relation" content="../tasks/tedtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="../tasks/tcrtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="../tasks/tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwsdled" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing WSDL files with the WSDL editor</title>
-</head>
-<body id="cwsdled"><a name="cwsdled"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing WSDL files with the WSDL Editor</h1>
-
-
-
-<div><p>The WSDL editor allows you to easily and graphically create, modify,
-view, and validate WSDL files.</p>
-
-<p>Using the WSDL editor, you can do the following:</p>
-
-<ul>
-<li>Create new WSDL files</li>
-
-<li>Validate and edit WSDL files</li>
-
-<li>Create and delete: <ul>
-<li>Services: used to aggregate a set of related ports. These are the root
-elements of all WSDL files.</li>
-
-<li>Ports: specify an address for a binding, thus defining a single communication
-endpoint.</li>
-
-<li>Bindings: specify concrete protocol and data format specifications for
-the operations and messages defined by a particular port type.</li>
-
-<li>Port types: a set of abstract operations that each refer to an input message
-and output messages.</li>
-
-<li>Operations: input and output messages.</li>
-
-<li>Messages: represent an abstract definition of the data being transmitted.
-A message consists of logical parts, each of which is associated with a definition
-within some type system.</li>
-
-<li>Parts: a flexible mechanism for describing the logical abstract content
-of a message.</li>
-
-<li>Types: describe all the data types used between the client and server.
-WSDL is not tied exclusively to a specific typing system, but it uses the
-W3C XML Schema specification as its default choice.</li>
-
-<li>Import statements: used to associate a namespace with a document location. </li>
-
-</ul>
-</li>
-
-<li>Import existing WSDL files for structured viewing</li>
-
-<li>Generate documentation from a WSDL document.</li>
-
-</ul>
-
-<p>The WSDL support in the WSDL editor is based on the W3C <a href="http://www.w3.org/TR/wsdl" target="_blank">Web Services Description Language (WSDL) 1.1</a>. The WSDL specification from the W3C Web site is
-also used for validation. </p>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../tasks/tedtwsdl.html">Editing WSDL files</a></strong><br />
-Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.</li>
-</ul>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="../tasks/tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gif b/docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gif
deleted file mode 100644
index e2e6686..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/show-hide-binding.gif b/docs/org.eclipse.wst.wsdl.ui.doc.user/images/show-hide-binding.gif
deleted file mode 100644
index cda9b58..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/show-hide-binding.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/soapskel.gif b/docs/org.eclipse.wst.wsdl.ui.doc.user/images/soapskel.gif
deleted file mode 100644
index 8042735..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/soapskel.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gif b/docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gif
deleted file mode 100644
index ccbe3b9..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/_f.cfs b/docs/org.eclipse.wst.wsdl.ui.doc.user/index/_f.cfs
deleted file mode 100644
index 431e531..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/_f.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/deletable b/docs/org.eclipse.wst.wsdl.ui.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_contributions
deleted file mode 100644
index a1a161e..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 17:27:08 EDT 2008
-org.eclipse.wst.wsdl.ui.doc.user=org.eclipse.wst.wsdl.ui.doc.user\n1.0.400.qualifier
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_dependencies
deleted file mode 100644
index 78c36f5..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 17:27:08 EDT 2008
-lucene=1.9.1.v200803061811
-analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_docs b/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_docs
deleted file mode 100644
index 50999c1..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,16 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 17:27:08 EDT 2008
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html=0
-/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html=0
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/segments b/docs/org.eclipse.wst.wsdl.ui.doc.user/index/segments
deleted file mode 100644
index 11e8832..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/myplugin.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/myplugin.xml
deleted file mode 100644
index 7168380..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/myplugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
- <toc file="wswsdleditort_toc.xml"/>
- <toc file="wswsdleditorc_toc.xml"/>
- <index path="index/"/>
-
-</extension>
-<extension point="org.eclipse.help.index">
- <index file="org.eclipse.wst.wsdl.ui.doc.userindex.xml"/>
-</extension>
-<extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.user.maplist b/docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.user.maplist
deleted file mode 100644
index ddeb99f..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.user.maplist
+++ /dev/null
@@ -1,10 +0,0 @@
-<maplist version="3.6.2">
- <nav>
- <map file="wswsdleditort_toc.ditamap"/>
- <map file="wswsdleditorc_toc.ditamap"/>
- </nav>
- <link>
- <map file="wswsdleditort_toc.ditamap"/>
- <map file="wswsdleditorc_toc.ditamap"/>
- </link>
-</maplist>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.userindex.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.userindex.xml
deleted file mode 100644
index 341e622..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.userindex.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
- <entry keyword="WSDL files">
- <entry keyword="importing">
- <topic href="tasks/timpwsdl.html#timpwsdl" title="Importing a WSDL file"/>
- </entry>
- <entry keyword="creating">
- <topic href="tasks/tcrtwsdl.html#tcrtwsdl" title="Creating a new WSDL file"/>
- </entry>
- <entry keyword="editing">
- <topic href="tasks/tedtwsdl.html#tedtwsdl" title="Editing WSDL files"/>
- </entry>
- <entry keyword="services">
- <topic href="tasks/taddsrvc.html#taddsrvc" title="Adding a service"/>
- </entry>
- <entry keyword="ports">
- <topic href="tasks/taddport.html#taddport" title="Adding a port to a service"/>
- </entry>
- <entry keyword="setting port types">
- <topic href="tasks/tsetprtt.html#tsetprtt" title="Setting a port type"/>
- </entry>
- <entry keyword="bindings">
- <topic href="tasks/tsetbind.html#tsetbind" title="Setting a binding"/>
- </entry>
- <entry keyword="operations">
- <topic href="tasks/taddoper.html#taddoper" title="Adding an operation"/>
- </entry>
- <entry keyword="messages">
- <topic href="tasks/taddmess.html#addingamessage" title="Adding a message"/>
- </entry>
- <entry keyword="message parts">
- <topic href="tasks/taddpart.html#taddpart" title="Adding a part to a message"/>
- </entry>
- <entry keyword="import statements">
- <topic href="tasks/tcrtimpt.html#tcrtimpt" title="Creating an import statement"/>
- </entry>
- <entry keyword="types">
- <topic href="tasks/tcrttype.html#tcrttype" title="Creating a new type for your WSDL file"/>
- </entry>
- </entry>
- <entry keyword="Web services">
- <entry keyword="importing WSDL files">
- <topic href="tasks/timpwsdl.html#timpwsdl" title="Importing a WSDL file"/>
- </entry>
- <entry keyword="creating WSDL files">
- <topic href="tasks/tcrtwsdl.html#tcrtwsdl" title="Creating a new WSDL file"/>
- </entry>
- <entry keyword="editing WSDL files">
- <topic href="tasks/tedtwsdl.html#tedtwsdl" title="Editing WSDL files"/>
- </entry>
- <entry keyword="adding services to WSDL">
- <topic href="tasks/taddsrvc.html#taddsrvc" title="Adding a service"/>
- </entry>
- <entry keyword="adding WSDL ports">
- <topic href="tasks/taddport.html#taddport" title="Adding a port to a service"/>
- </entry>
- <entry keyword="setting port types">
- <topic href="tasks/tsetprtt.html#tsetprtt" title="Setting a port type"/>
- </entry>
- <entry keyword="bindings">
- <entry keyword="creating">
- <topic href="tasks/tsetbind.html#tsetbind" title="Setting a binding"/>
- </entry>
- </entry>
- <entry keyword="setting WSDL bindings">
- <topic href="tasks/tsetbind.html#tsetbind" title="Setting a binding"/>
- </entry>
- <entry keyword="adding WSDL operations">
- <topic href="tasks/taddoper.html#taddoper" title="Adding an operation"/>
- </entry>
- <entry keyword="adding WSDL messages">
- <topic href="tasks/taddmess.html#addingamessage" title="Adding a message"/>
- </entry>
- <entry keyword="adding WSDL message parts">
- <topic href="tasks/taddpart.html#taddpart" title="Adding a part to a message"/>
- </entry>
- <entry keyword="adding WSDL import statements">
- <topic href="tasks/tcrtimpt.html#tcrtimpt" title="Creating an import statement"/>
- </entry>
- <entry keyword="creating WSDL types">
- <topic href="tasks/tcrttype.html#tcrttype" title="Creating a new type for your WSDL file"/>
- </entry>
- </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.properties b/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.properties
deleted file mode 100644
index a216421..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-pluginName = WSDL Editor Documentation
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml
deleted file mode 100644
index 7168380..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
- <toc file="wswsdleditort_toc.xml"/>
- <toc file="wswsdleditorc_toc.xml"/>
- <index path="index/"/>
-
-</extension>
-<extension point="org.eclipse.help.index">
- <index file="org.eclipse.wst.wsdl.ui.doc.userindex.xml"/>
-</extension>
-<extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.dita
deleted file mode 100644
index 2665d04..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.dita
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="addingamessage" xml:lang="en-us">
-<title>Adding a message</title>
-<shortdesc>Messages represent an abstract definition of the data being transmitted.
-A message consists of logical parts, each of which is associated with a definition
-within some type system. WSDL messages are top level objects that can be referenced
-by an operation's input, output and fault elements (within a port type).</shortdesc>
-<prolog><metadata>
-<keywords><indexterm keyref="taddmess|1|WebservicesaddingWSDLmessages" status="unchanged">Web
-services<indexterm>adding WSDL messages</indexterm></indexterm><indexterm
-keyref="taddmess|2|WSDLmessages" status="unchanged">WSDL files<indexterm>messages</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq></prereq>
-<context><p>You can create a message using the Outline view by right-clicking
-the <b>Messages</b> folder and clicking <b>Add Message</b>.</p><p>To create
-a new message for your input, output, or fault element, complete the following
-steps:</p></context>
-<steps>
-<step><cmd>In the Design view, right-click your input, output, or fault element
-and click <b>Set Message > New Message.</b></cmd></step>
-<step><cmd>Type the name of the message in the <uicontrol>General</uicontrol> pane
-of the Properties view.</cmd><info>This name should be a unique amongst all
-messages defined within the enclosing WSDL document.</info></step>
-<step><cmd>The new message will appear in the Design view within the port
-type.</cmd></step>
-</steps>
-<postreq><p> <b>Note</b>: Messages are referenced within a port type (specifically
-by an operation's input, output and fault objects). The input, output and
-fault objects within a binding do not reference messages. Hence you cannot
-create a new message by right clicking on a input, output, or fault within
-a binding (these are also known as binding input, binding output and binding
-faults).</p><note type="tip">You can also create a new message for your input,
-output, or fault element using the Outline view. Under the <b>Port Types</b> folder,
-right-click your element and click <b>Set Message > Add Message</b>. Your
-message will appear in the Outline view under the <b>Messages</b> folder.</note></postreq>
-</taskbody>
-<task id="reusingamessage" xml:lang="en-us">
-<title>Reusing a message</title>
-<taskbody>
-<prereq>To reuse a message for your input, output, or fault element, complete
-the following steps:</prereq>
-<steps>
-<step><cmd>In the Design view, right-click your input, output, or fault element
-and click <b>Set Message > Existing Message.</b></cmd></step>
-<step><cmd>In the <b>Name</b> field, type a search string to filter the list
-or leave the field blank to view all</cmd></step>
-<step><cmd>You can change the scope of the list by selecting one of the following
-options:</cmd><info><ul>
-<li><b>Workspace</b>: lists the messages available in your workspace.</li>
-<li><b>Enclosing Project</b>: lists the messages available in the project
-that contains your file.</li>
-<li><b>Current Resource</b>: lists the messages available in your current
-file.</li>
-<li><b>Working Sets</b>: lists the messages available in a specified set of
-files. To specify a working set, click <b>Choose</b>. You can select files
-from an existing working set or create a new working set. Once you have selected
-the files, click <b>OK</b>.</li>
-</ul></info></step>
-<step><cmd>The existing messages will be listed. Select one and click <b>OK</b>.</cmd>
-</step>
-</steps>
-<postreq></postreq>
-</taskbody>
-</task>
-<task id="importingamessage" xml:lang="en-us">
-<title>Importing a message</title>
-<taskbody>
-<prereq>If you want to import an existing message for your input, output,
-or fault element, follow these steps:</prereq>
-<steps>
-<step><cmd>In the Design view, right-click your input, output, or fault element
-and click <b>Set Message > Existing Message.</b></cmd></step>
-<step><cmd>In the <b>Name</b> field, type a search string to filter the list
-or leave the field blank to view all.</cmd></step>
-<step><cmd>You can import a message by selecting one of the following options:</cmd>
-<info><ul>
-<li><b>Workspace</b>: lists the messages available in your workspace.</li>
-<li><b>Enclosing Project</b>: lists the messages available in the project
-that contains your file.</li>
-<li><b>Working Sets</b>: lists the messages available in a specified set of
-files. To specify a working set, click <b>Choose</b>. You can select files
-from an existing working set or create a new working set. Once you have selected
-the files, click <b>OK</b>.</li>
-</ul></info></step>
-<step><cmd>The messages will be listed. Select one and click <b>OK</b>.</cmd>
-</step>
-</steps>
-<postreq>You can now add parts to your message. Parts are a flexible mechanism
-for describing the logical abstract content of a message. For more information,
-see <xref format="dita" href="taddpart.dita" scope="local">Adding a part to
-a message</xref>.</postreq>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html
deleted file mode 100644
index fe1842d..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding a message" />
-<meta name="abstract" content="Messages represent an abstract definition of the data being transmitted. A message consists of logical parts, each of which is associated with a definition within some type system. WSDL messages are top level objects that can be referenced by an operation's input, output and fault elements (within a port type)." />
-<meta name="description" content="Messages represent an abstract definition of the data being transmitted. A message consists of logical parts, each of which is associated with a definition within some type system. WSDL messages are top level objects that can be referenced by an operation's input, output and fault elements (within a port type)." />
-<meta content="Web services, adding WSDL messages, WSDL files, messages" name="DC.subject" />
-<meta content="Web services, adding WSDL messages, WSDL files, messages" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="addingamessage" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding a message</title>
-</head>
-<body id="addingamessage"><a name="addingamessage"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding a message</h1>
-
-
-
-<div><p>Messages represent an abstract definition of the data being transmitted.
-A message consists of logical parts, each of which is associated with a definition
-within some type system. WSDL messages are top level objects that can be referenced
-by an operation's input, output and fault elements (within a port type).</p>
-
-<div class="p" />
-
-<div class="section"><p>You can create a message using the Outline view by right-clicking
-the <strong>Messages</strong> folder and clicking <strong>Add Message</strong>.</p>
-<p>To create
-a new message for your input, output, or fault element, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click your input, output, or fault element
-and click <strong>Set Message > New Message.</strong></span></li>
-
-<li class="stepexpand"><span>Type the name of the message in the <span class="uicontrol">General</span> pane
-of the Properties view.</span> This name should be a unique amongst all
-messages defined within the enclosing WSDL document.</li>
-
-<li class="stepexpand"><span>The new message will appear in the Design view within the port
-type.</span></li>
-
-</ol>
-
-<div class="section"><p> <strong>Note</strong>: Messages are referenced within a port type (specifically
-by an operation's input, output and fault objects). The input, output and
-fault objects within a binding do not reference messages. Hence you cannot
-create a new message by right clicking on a input, output, or fault within
-a binding (these are also known as binding input, binding output and binding
-faults).</p>
-<div class="tip"><span class="tiptitle">Tip:</span> You can also create a new message for your input,
-output, or fault element using the Outline view. Under the <strong>Port Types</strong> folder,
-right-click your element and click <strong>Set Message > Add Message</strong>. Your
-message will appear in the Outline view under the <strong>Messages</strong> folder.</div>
-</div>
-
-</div>
-
-<div class="nested1" xml:lang="en-us" id="reusingamessage"><a name="reusingamessage"><!-- --></a>
-<h2 class="topictitle2">Reusing a message</h2>
-
-<div>
-<div class="p">To reuse a message for your input, output, or fault element, complete
-the following steps:</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click your input, output, or fault element
-and click <strong>Set Message > Existing Message.</strong></span></li>
-
-<li class="stepexpand"><span>In the <strong>Name</strong> field, type a search string to filter the list
-or leave the field blank to view all</span></li>
-
-<li class="stepexpand"><span>You can change the scope of the list by selecting one of the following
-options:</span> <ul>
-<li><strong>Workspace</strong>: lists the messages available in your workspace.</li>
-
-<li><strong>Enclosing Project</strong>: lists the messages available in the project
-that contains your file.</li>
-
-<li><strong>Current Resource</strong>: lists the messages available in your current
-file.</li>
-
-<li><strong>Working Sets</strong>: lists the messages available in a specified set of
-files. To specify a working set, click <strong>Choose</strong>. You can select files
-from an existing working set or create a new working set. Once you have selected
-the files, click <strong>OK</strong>.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>The existing messages will be listed. Select one and click <strong>OK</strong>.</span>
-</li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-</div>
-
-<div class="nested1" xml:lang="en-us" id="importingamessage"><a name="importingamessage"><!-- --></a>
-<h2 class="topictitle2">Importing a message</h2>
-
-<div>
-<div class="p">If you want to import an existing message for your input, output,
-or fault element, follow these steps:</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click your input, output, or fault element
-and click <strong>Set Message > Existing Message.</strong></span></li>
-
-<li class="stepexpand"><span>In the <strong>Name</strong> field, type a search string to filter the list
-or leave the field blank to view all.</span></li>
-
-<li class="stepexpand"><span>You can import a message by selecting one of the following options:</span>
- <ul>
-<li><strong>Workspace</strong>: lists the messages available in your workspace.</li>
-
-<li><strong>Enclosing Project</strong>: lists the messages available in the project
-that contains your file.</li>
-
-<li><strong>Working Sets</strong>: lists the messages available in a specified set of
-files. To specify a working set, click <strong>Choose</strong>. You can select files
-from an existing working set or create a new working set. Once you have selected
-the files, click <strong>OK</strong>.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>The messages will be listed. Select one and click <strong>OK</strong>.</span>
-</li>
-
-</ol>
-
-<div class="section">You can now add parts to your message. Parts are a flexible mechanism
-for describing the logical abstract content of a message. For more information,
-see <a href="taddpart.dita">Adding a part to a message</a>.</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.dita
deleted file mode 100644
index 8c1c383..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="taddoper" xml:lang="en-us">
-<title>Adding an operation</title>
-<shortdesc>An operation names the operation and lists the expected inputs
-and outputs. The operation element may also contain a fault sub-element that
-describes any error data the operation may return.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Web services<indexterm>adding WSDL operations</indexterm></indexterm>
-<indexterm>WSDL files<indexterm>operations</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context>Using these, you can declare four transmission primitives that an
-endpoint can support:<ul>
-<li> <b>One-way</b>: the endpoint receives a message.</li>
-<li> <b>Request-response</b>: the endpoint receives a message, and sends a
-correlated message.</li>
-<li> <b>Solicit-response</b>: the endpoint sends a message, and receives a
-correlated message.</li>
-<li> <b>Notification</b>: the endpoint sends a message.</li>
-</ul><p>You can add an operation to a port type or a port binding.</p><p>To
-add an operation to a port type, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the Design view, right-click your port type.</cmd><info>Click <b>Add
-Operation</b>. To select the new operation, click the operation in the port
-type object.</info></step>
-<step><cmd>In the Properties view, click the <b>General</b> pane.</cmd></step>
-<step><cmd>In the <b>Name</b> field, type the name of the operation.</cmd>
-</step>
-<step><cmd>Right click on the operation to add input, output or fault objects.</cmd>
-<info>Depending on an operation's inputs and outputs it can be classified
-as follows:<ul>
-<li><b>One way operation</b>: input </li>
-<li><b>Request response operation</b>: input, output </li>
-<li><b> Solicit response operation</b>: output, input </li>
-<li><b>Notification operation</b>: output</li>
-</ul></info></step>
-<step><cmd>In the Properties view, type any information about the operation
-you wish the user to read in the <b>Documentation</b> pane.</cmd></step>
-</steps>
-<result><p> <b>Tip</b>: You can also create a new operation for your port
-type using the Outline view. Right click on a port type in the <uicontrol>Port
-Type</uicontrol> folder and select <uicontrol>Add Operation</uicontrol>.</p></result>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html
deleted file mode 100644
index d7914b3..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding an operation" />
-<meta name="abstract" content="An operation names the operation and lists the expected inputs and outputs. The operation element may also contain a fault sub-element that describes any error data the operation may return." />
-<meta name="description" content="An operation names the operation and lists the expected inputs and outputs. The operation element may also contain a fault sub-element that describes any error data the operation may return." />
-<meta content="Web services, adding WSDL operations, WSDL files, operations" name="DC.subject" />
-<meta content="Web services, adding WSDL operations, WSDL files, operations" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../concepts/cwsdled.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddoper" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding an operation</title>
-</head>
-<body id="taddoper"><a name="taddoper"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding an operation</h1>
-
-
-
-<div><p>An operation names the operation and lists the expected inputs
-and outputs. The operation element may also contain a fault sub-element that
-describes any error data the operation may return.</p>
-
-<div class="section">Using these, you can declare four transmission primitives that an
-endpoint can support:<ul>
-<li> <strong>One-way</strong>: the endpoint receives a message.</li>
-
-<li> <strong>Request-response</strong>: the endpoint receives a message, and sends a
-correlated message.</li>
-
-<li> <strong>Solicit-response</strong>: the endpoint sends a message, and receives a
-correlated message.</li>
-
-<li> <strong>Notification</strong>: the endpoint sends a message.</li>
-
-</ul>
-<p>You can add an operation to a port type or a port binding.</p>
-<p>To
-add an operation to a port type, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click your port type.</span> Click <strong>Add
-Operation</strong>. To select the new operation, click the operation in the port
-type object.</li>
-
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> pane.</span></li>
-
-<li class="stepexpand"><span>In the <strong>Name</strong> field, type the name of the operation.</span>
-</li>
-
-<li class="stepexpand"><span>Right click on the operation to add input, output or fault objects.</span>
- Depending on an operation's inputs and outputs it can be classified
-as follows:<ul>
-<li><strong>One way operation</strong>: input </li>
-
-<li><strong>Request response operation</strong>: input, output </li>
-
-<li><strong> Solicit response operation</strong>: output, input </li>
-
-<li><strong>Notification operation</strong>: output</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, type any information about the operation
-you wish the user to read in the <strong>Documentation</strong> pane.</span></li>
-
-</ol>
-
-<div class="section"><p> <strong>Tip</strong>: You can also create a new operation for your port
-type using the Outline view. Right click on a port type in the <span class="uicontrol">Port
-Type</span> folder and select <span class="uicontrol">Add Operation</span>.</p>
-</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.dita
deleted file mode 100644
index 3c287bc..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="taddpart" xml:lang="en-us">
-<title>Adding a part to a message</title>
-<shortdesc>All messages contain one or more parts. Parts are a flexible mechanism
-for describing the logical abstract content of a message. The message definition
-associates each part with a type using a message-typing attribute.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Web services<indexterm>adding WSDL message parts</indexterm></indexterm>
-<indexterm>WSDL files<indexterm>message parts</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>To add a part to a message, complete the following steps:</p></context>
-<steps>
-<step><cmd>In Design view, right-click an input, output, or fault object and
-click <b>Add Part</b>.</cmd><stepresult>The part is added to the input, output,
-or fault's message reference. To select the part, click the part in the port
-type object.</stepresult></step>
-<step><cmd>In the Properties view, click the <b>General</b> pane.</cmd></step>
-<step><cmd>In the <b>Name</b> field, type the name of the part.</cmd></step>
-<step><cmd>Your part can refer to either a <b>Type</b> or an <b>Element</b>.</cmd>
-<info>Select the appropriate option as the <b>Reference Kind</b> .</info>
-</step>
-<step><cmd>If you selected <b>Type</b>, you now have the option of selecting
-an XML schema data type from the <b>Type</b> drop down list.</cmd><info>The
-list of types comes from any available referenced XML schemas.</info></step>
-<step><cmd>If you selected <b>Element</b> , you now have the option of selecting
-an XML schema element from the <b>Element</b> drop down list.</cmd><info>The
-list of elements comes from any available referenced XML schemas.</info></step>
-</steps>
-<result><note type="tip"> You can also create a new part for your message
-using the Outline view. Under the <b>Messages</b> folder, right-click your
-element and click <b>Add Part</b>. Your part will automatically appear in
-the Outline view (under the <b>Messages</b> folder), but it will only appear
-in the Design view if the message you added it to currently does.</note></result>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html
deleted file mode 100644
index 7371606..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding a part to a message" />
-<meta name="abstract" content="All messages contain one or more parts. Parts are a flexible mechanism for describing the logical abstract content of a message. The message definition associates each part with a type using a message-typing attribute." />
-<meta name="description" content="All messages contain one or more parts. Parts are a flexible mechanism for describing the logical abstract content of a message. The message definition associates each part with a type using a message-typing attribute." />
-<meta content="Web services, adding WSDL message parts, WSDL files, message parts" name="DC.subject" />
-<meta content="Web services, adding WSDL message parts, WSDL files, message parts" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../concepts/cwsdled.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddpart" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding a part to a message</title>
-</head>
-<body id="taddpart"><a name="taddpart"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding a part to a message</h1>
-
-
-
-<div><p>All messages contain one or more parts. Parts are a flexible mechanism
-for describing the logical abstract content of a message. The message definition
-associates each part with a type using a message-typing attribute.</p>
-
-<div class="section"><p>To add a part to a message, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In Design view, right-click an input, output, or fault object and
-click <strong>Add Part</strong>.</span> The part is added to the input, output,
-or fault's message reference. To select the part, click the part in the port
-type object.</li>
-
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> pane.</span></li>
-
-<li class="stepexpand"><span>In the <strong>Name</strong> field, type the name of the part.</span></li>
-
-<li class="stepexpand"><span>Your part can refer to either a <strong>Type</strong> or an <strong>Element</strong>.</span>
- Select the appropriate option as the <strong>Reference Kind</strong> .
-</li>
-
-<li class="stepexpand"><span>If you selected <strong>Type</strong>, you now have the option of selecting
-an XML schema data type from the <strong>Type</strong> drop down list.</span> The
-list of types comes from any available referenced XML schemas.</li>
-
-<li class="stepexpand"><span>If you selected <strong>Element</strong> , you now have the option of selecting
-an XML schema element from the <strong>Element</strong> drop down list.</span> The
-list of elements comes from any available referenced XML schemas.</li>
-
-</ol>
-
-<div class="section"><div class="tip"><span class="tiptitle">Tip:</span> You can also create a new part for your message
-using the Outline view. Under the <strong>Messages</strong> folder, right-click your
-element and click <strong>Add Part</strong>. Your part will automatically appear in
-the Outline view (under the <strong>Messages</strong> folder), but it will only appear
-in the Design view if the message you added it to currently does.</div>
-</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.dita
deleted file mode 100644
index 7d69f08..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.dita
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="taddport" xml:lang="en-us">
-<title>Adding a port to a service</title>
-<shortdesc>A port defines an individual endpoint by specifying a single address
-for a binding. The port contains a 'binding' attribute that references a binding
-and an address element that provides a specification for the endpoint.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Web services<indexterm>adding WSDL ports</indexterm></indexterm>
-<indexterm>WSDL files<indexterm>ports</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>Services are used to group sets of related ports together. Ports
-within a service have the following relationship:</p><ul>
-<li>None of the ports communicate with each other (for example, the output
-of one port is not the input of another).</li>
-<li>If a service has several ports that share a port type, but employ different
-bindings or addresses, the ports are alternatives. Each port provides semantically
-equivalent behavior (within the transport and message format limitations imposed
-by each binding).</li>
-<li>You can determine a service's port types by examining its ports. Using
-this information, a user can determine if a given machine supports all the
-operations needed to complete a given task.</li>
-</ul><p>To add a port to a service, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the Design view, right-click the service you want to add a port
-to, then click <b>Add Port.</b> </cmd></step>
-<step><cmd>Fill in the <b>Name</b> for the port.</cmd><info>The name of the
-port should provide it with a unique name amongst all the ports defined within
-the service.</info></step>
-<step><cmd>Select a <b>Binding</b> and <uicontrol>Protocol</uicontrol> for
-the port, and enter the address of the port into the <uicontrol>Address</uicontrol> field.
-Click <uicontrol>Finish</uicontrol>.</cmd><info>To select the new port, click
-the port in the service object. You can change the information you entered
-about this port any time in the <uicontrol>General</uicontrol> pane.</info>
-</step>
-<step><cmd>Type any information about the port you want the user to read in
-the <b>Documentation</b> pane of the Properties view.</cmd></step>
-<step><cmd>To manage extensions, click the <b>Extensions</b> pane. You can
-either add, sort, or remove extensions. </cmd></step>
-</steps>
-<result><p>You can create a new binding for your port, re-use an existing
-one, or import one. A <b>Binding</b> defines the message format and protocol
-details for operations and messages defined by a particular port type. For
-more information, see <xref format="dita" href="tsetbind.dita" scope="local">Setting
-a binding</xref> .</p><p>You can also create a port using the Outline view
-by right-clicking your service under the <b>Services</b> folder and clicking <b>Add
-Port</b>. Your port (regardless of which view you create it in) will appear
-in both the Design view and the Outline view.</p></result>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html
deleted file mode 100644
index 4e8778a..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding a port to a service" />
-<meta name="abstract" content="A port defines an individual endpoint by specifying a single address for a binding. The port contains a 'binding' attribute that references a binding and an address element that provides a specification for the endpoint." />
-<meta name="description" content="A port defines an individual endpoint by specifying a single address for a binding. The port contains a 'binding' attribute that references a binding and an address element that provides a specification for the endpoint." />
-<meta content="Web services, adding WSDL ports, WSDL files, ports" name="DC.subject" />
-<meta content="Web services, adding WSDL ports, WSDL files, ports" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../concepts/cwsdled.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddport" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding a port to a service</title>
-</head>
-<body id="taddport"><a name="taddport"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding a port to a service</h1>
-
-
-
-<div><p>A port defines an individual endpoint by specifying a single address
-for a binding. The port contains a 'binding' attribute that references a binding
-and an address element that provides a specification for the endpoint.</p>
-
-<div class="section"><p>Services are used to group sets of related ports together. Ports
-within a service have the following relationship:</p>
-<ul>
-<li>None of the ports communicate with each other (for example, the output
-of one port is not the input of another).</li>
-
-<li>If a service has several ports that share a port type, but employ different
-bindings or addresses, the ports are alternatives. Each port provides semantically
-equivalent behavior (within the transport and message format limitations imposed
-by each binding).</li>
-
-<li>You can determine a service's port types by examining its ports. Using
-this information, a user can determine if a given machine supports all the
-operations needed to complete a given task.</li>
-
-</ul>
-<p>To add a port to a service, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click the service you want to add a port
-to, then click <strong>Add Port.</strong> </span></li>
-
-<li class="stepexpand"><span>Fill in the <strong>Name</strong> for the port.</span> The name of the
-port should provide it with a unique name amongst all the ports defined within
-the service.</li>
-
-<li class="stepexpand"><span>Select a <strong>Binding</strong> and <span class="uicontrol">Protocol</span> for
-the port, and enter the address of the port into the <span class="uicontrol">Address</span> field.
-Click <span class="uicontrol">Finish</span>.</span> To select the new port, click
-the port in the service object. You can change the information you entered
-about this port any time in the <span class="uicontrol">General</span> pane.
-</li>
-
-<li class="stepexpand"><span>Type any information about the port you want the user to read in
-the <strong>Documentation</strong> pane of the Properties view.</span></li>
-
-<li class="stepexpand"><span>To manage extensions, click the <strong>Extensions</strong> pane. You can
-either add, sort, or remove extensions. </span></li>
-
-</ol>
-
-<div class="section"><p>You can create a new binding for your port, re-use an existing
-one, or import one. A <strong>Binding</strong> defines the message format and protocol
-details for operations and messages defined by a particular port type. For
-more information, see <a href="tsetbind.dita">Setting a binding</a> .</p>
-<p>You can also create a port using the Outline view
-by right-clicking your service under the <strong>Services</strong> folder and clicking <strong>Add
-Port</strong>. Your port (regardless of which view you create it in) will appear
-in both the Design view and the Outline view.</p>
-</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.dita
deleted file mode 100644
index 193f226..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.dita
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="taddsrvc" xml:lang="en-us">
-<title>Adding a service</title>
-<shortdesc>The <systemoutput>service</systemoutput> element is a collection
-of related ports and specifies the location of the service.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Web services<indexterm>adding services to WSDL</indexterm></indexterm>
-<indexterm>WSDL files<indexterm>services</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>To create a new service, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the Design view, right-click in any blank space and click <b>Add
-Service</b>. To select the new service, click the service object.</cmd></step>
-<step><cmd>In the Properties view, click the <b>General</b> pane. In the <b>Name</b> field,
-type the name of the service.</cmd><info>The name of the service provides
-it with a unique name amongst all the services defined within in the enclosing
-WSDL document.</info></step>
-<step><cmd>Type any information about the service you want the user to read
-in the <b>Documentation</b> pane.</cmd></step>
-<step><cmd>To manage extensions, click the <b>Extensions</b> pane. You can
-either add, sort, or remove extensions.<draft-comment> Refer to the related
-tasks for more details. Add link to the XSD Editor plugin topic for "Adding
-extension components"</draft-comment></cmd></step>
-</steps>
-<result><p> <b>Tip</b>: You can also create a service using the Outline view
-by right-clicking the <b>Services</b> folder and clicking <b>Add Service</b>.</p><p>You
-can now add a port to your service. A port defines an individual endpoint
-by specifying a single address for a binding.</p></result>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html
deleted file mode 100644
index 3493106..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding a service" />
-<meta name="abstract" content="The service element is a collection of related ports and specifies the location of the service." />
-<meta name="description" content="The service element is a collection of related ports and specifies the location of the service." />
-<meta content="Web services, adding services to WSDL, WSDL files, services" name="DC.subject" />
-<meta content="Web services, adding services to WSDL, WSDL files, services" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../concepts/cwsdled.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddsrvc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding a service</title>
-</head>
-<body id="taddsrvc"><a name="taddsrvc"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding a service</h1>
-
-
-
-<div><p>The <tt class="sysout">service</tt> element is a collection
-of related ports and specifies the location of the service.</p>
-
-<div class="section"><p>To create a new service, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click in any blank space and click <strong>Add
-Service</strong>. To select the new service, click the service object.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> pane. In the <strong>Name</strong> field,
-type the name of the service.</span> The name of the service provides
-it with a unique name amongst all the services defined within in the enclosing
-WSDL document.</li>
-
-<li class="stepexpand"><span>Type any information about the service you want the user to read
-in the <strong>Documentation</strong> pane.</span></li>
-
-<li class="stepexpand"><span>To manage extensions, click the <strong>Extensions</strong> pane. You can
-either add, sort, or remove extensions.</span></li>
-
-</ol>
-
-<div class="section"><p> <strong>Tip</strong>: You can also create a service using the Outline view
-by right-clicking the <strong>Services</strong> folder and clicking <strong>Add Service</strong>.</p>
-<p>You
-can now add a port to your service. A port defines an individual endpoint
-by specifying a single address for a binding.</p>
-</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.dita
deleted file mode 100644
index abdaff5..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tcrtimpt" xml:lang="en-us">
-<title>Creating an import statement</title>
-<shortdesc>The import statement is used to import other WSDL documents or
-XML schemas into your WSDL document. This enables you to have more modular
-WSDL documents. The use of the <b>import</b> statement allows the separation
-of the different elements of a service definition into independent documents,
-which can then be imported as needed. This technique helps in writing clearer
-service definitions, by separating the definitions according to their level
-of abstraction.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Web services<indexterm>adding WSDL import statements</indexterm></indexterm>
-<indexterm>WSDL files<indexterm>import statements</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>To create an import statement, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the Outline view, right-click the <b>Imports</b> folder and
-click <b>Add Import.</b> Select your new import statement.</cmd></step>
-<step><cmd>In the Properties view, click the <b>General</b> pane.</cmd></step>
-<step><cmd>Click the icon to the right of the <b>Location</b> field to open
-the Select File window.<uicontrol></uicontrol>.</cmd></step>
-<step><cmd>Select a WSDL file or XML Schema to import by doing one of the
-following:</cmd><info><ul>
-<li>Select a file from another project in the workspace in the <uicontrol>Workspace
-Files</uicontrol> section.</li>
-<li>Click <uicontrol>Import Files</uicontrol> and then <uicontrol>Browse</uicontrol> to
-find and select files outside the workspace. Click <uicontrol>Finish</uicontrol> after
-completing this Import wizard.</li>
-</ul>Click <uicontrol>OK</uicontrol>.</info></step>
-<step><cmd>Type any information about the import statement you want the user
-to read in the <b>Documentation</b> pane.</cmd></step>
-</steps>
-<result>Once you specify the location of the document you wish to import,
-the import object's label changes to reflect the specified location. Imported
-WSDL components may now be visible within the editor.</result>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html
deleted file mode 100644
index ca7f9c2..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating an import statement" />
-<meta name="abstract" content="The import statement is used to import other WSDL documents or XML schemas into your WSDL document. This enables you to have more modular WSDL documents. The use of the import statement allows the separation of the different elements of a service definition into independent documents, which can then be imported as needed. This technique helps in writing clearer service definitions, by separating the definitions according to their level of abstraction." />
-<meta name="description" content="The import statement is used to import other WSDL documents or XML schemas into your WSDL document. This enables you to have more modular WSDL documents. The use of the import statement allows the separation of the different elements of a service definition into independent documents, which can then be imported as needed. This technique helps in writing clearer service definitions, by separating the definitions according to their level of abstraction." />
-<meta content="Web services, adding WSDL import statements, WSDL files, import statements" name="DC.subject" />
-<meta content="Web services, adding WSDL import statements, WSDL files, import statements" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../concepts/cwsdled.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcrtimpt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an import statement</title>
-</head>
-<body id="tcrtimpt"><a name="tcrtimpt"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating an import statement</h1>
-
-
-
-<div><p>The import statement is used to import other WSDL documents or
-XML schemas into your WSDL document. This enables you to have more modular
-WSDL documents. The use of the <strong>import</strong> statement allows the separation
-of the different elements of a service definition into independent documents,
-which can then be imported as needed. This technique helps in writing clearer
-service definitions, by separating the definitions according to their level
-of abstraction.</p>
-
-<div class="section"><p>To create an import statement, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Outline view, right-click the <strong>Imports</strong> folder and
-click <strong>Add Import.</strong> Select your new import statement.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> pane.</span></li>
-
-<li class="stepexpand"><span>Click the icon to the right of the <strong>Location</strong> field to open
-the Select File window.<span class="uicontrol" />.</span></li>
-
-<li class="stepexpand"><span>Select a WSDL file or XML Schema to import by doing one of the
-following:</span> <ul>
-<li>Select a file from another project in the workspace in the <span class="uicontrol">Workspace
-Files</span> section.</li>
-
-<li>Click <span class="uicontrol">Import Files</span> and then <span class="uicontrol">Browse</span> to
-find and select files outside the workspace. Click <span class="uicontrol">Finish</span> after
-completing this Import wizard.</li>
-
-</ul>
-Click <span class="uicontrol">OK</span>.</li>
-
-<li class="stepexpand"><span>Type any information about the import statement you want the user
-to read in the <strong>Documentation</strong> pane.</span></li>
-
-</ol>
-
-<div class="section">Once you specify the location of the document you wish to import,
-the import object's label changes to reflect the specified location. Imported
-WSDL components may now be visible within the editor.</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.dita
deleted file mode 100644
index 5e9a7c1..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tcrttype" xml:lang="en-us">
-<title>Creating a new type for your WSDL file</title>
-<shortdesc>Types describe all the data types used between the client and server.
-WSDL is not tied exclusively to a specific typing system, but it uses the
-W3C XML Schema specification as its default choice.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Web services<indexterm>creating WSDL types</indexterm></indexterm>
-<indexterm>WSDL files<indexterm>types</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>WSDL allows type systems to be added via extensibility elements.
-An extensibility element may appear under the <b>types</b> element to identify
-the type definition system being used and to provide an XML container element
-for the type definitions.</p><p>To add an XSD type or element to your WSDL
-file: </p></context>
-<steps-unordered>
-<step><cmd>In the Design view, click the arrow icon to the right of the port
-type object to open that operation in the XML schema editor.</cmd></step>
-</steps-unordered>
-<result><p>For more information about XML schemas, see the <xref format="html"
-href="../../org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita" scope="peer">XML
-schema editor documentation</xref> for links to online resources.</p></result>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html
deleted file mode 100644
index b3a2449..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a new type for your WSDL file" />
-<meta name="abstract" content="Types describe all the data types used between the client and server. WSDL is not tied exclusively to a specific typing system, but it uses the W3C XML Schema specification as its default choice." />
-<meta name="description" content="Types describe all the data types used between the client and server. WSDL is not tied exclusively to a specific typing system, but it uses the W3C XML Schema specification as its default choice." />
-<meta content="Web services, creating WSDL types, WSDL files, types" name="DC.subject" />
-<meta content="Web services, creating WSDL types, WSDL files, types" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../concepts/cwsdled.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcrttype" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a new type for your WSDL file</title>
-</head>
-<body id="tcrttype"><a name="tcrttype"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a new type for your WSDL file</h1>
-
-
-
-<div><p>Types describe all the data types used between the client and server.
-WSDL is not tied exclusively to a specific typing system, but it uses the
-W3C XML Schema specification as its default choice.</p>
-
-<div class="section"><p>WSDL allows type systems to be added via extensibility elements.
-An extensibility element may appear under the <strong>types</strong> element to identify
-the type definition system being used and to provide an XML container element
-for the type definitions.</p>
-<p>To add an XSD type or element to your WSDL
-file: </p>
-</div>
-
-
-<div class="p"><span>In the Design view, click the arrow icon to the right of the port
-type object to open that operation in the XML schema editor.</span></div>
-
-
-<div class="section"><p>For more information about XML schemas, see the <a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita">XML schema editor documentation</a> for links to online resources.</p>
-</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.dita
deleted file mode 100644
index 8292a70..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.dita
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tcrtwsdl" xml:lang="en-us">
-<title>Creating a new WSDL file</title>
-<shortdesc>You can create a new, empty WSDL file, then edit it using the WSDL
-editor.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>WSDL files<indexterm>creating</indexterm></indexterm>
-<indexterm>Web services<indexterm>creating WSDL files</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>To create a WSDL file, complete the following steps:</p></context>
-<steps>
-<step><cmd>Create a project to contain the WSDL document.</cmd><info>It does
-not matter what kind of project you create.</info></step>
-<step><cmd>In the workbench, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade> and select <menucascade>
-<uicontrol>Web Services</uicontrol><uicontrol>WSDL</uicontrol></menucascade>.</cmd>
-<info>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>Select the project or folder that will contain the WSDL file.</cmd>
-<info>In the <uicontrol>File name</uicontrol> field, type the name of the
-WSDL file. The name of your XML file must end in <systemoutput>.wsdl</systemoutput></info>
-</step>
-<step><cmd>Click <uicontrol>Next</uicontrol> and enter the following information
-on the next page of the wizard:</cmd>
-<substeps>
-<substep><cmd>A <uicontrol>Target namespace</uicontrol> for the WSDL file
-or accept the default (<codeph>http://www.example.org/<i>MyWSDLFile</i>/</codeph>).</cmd>
-<info>The target namespace is used for the names of messages and the port
-type, binding and service defined in the WSDL file. The value must take the
-form of a valid URI (for example, <codeph>http://www.mycompany.com/myservice/</codeph>)</info>
-</substep>
-<substep><cmd>The <uicontrol>Prefix</uicontrol> associated with the target
-namespace.</cmd></substep>
-<substep><cmd>Select <uicontrol>Create WSDL Skeleton</uicontrol> if you want
-the wizard to create the skeleton of the WSDL file.</cmd><info>This will generate
-the WSDL elements required for your service, including bindings, ports and
-messages. You can then modify these to meet the requirements of your Web service
-.</info></substep>
-<substep><cmd>If you have chosen to create a WSDL skeleton, select the binding
-options you want to use in the <uicontrol>Protocol</uicontrol> drop down.
-The options are SOAP and HTTP. Use the SOAP protocol when you want to exchange
-structured and typed information. Use the HTTP protocol when you want your
-application client to just request or update information.</cmd></substep>
-<substep><cmd></cmd><info>If you select SOAP you can then select the encoding
-style you want to use:<ul>
-<li><uicontrol>document literal</uicontrol>. Document style messages, literal
-encoding. Use this style of binding when you want to send SOAP messages that
-can be validated by an XML validator. All the data types in the SOAP message
-body are defined in a schema, so the WSDL parts must point to schema elements. </li>
-<li><uicontrol>rpc literal</uicontrol>. RPC style messages, literal encoding.
-Use this style of binding when you want to specify the operation method names
-in your SOAP messages so a server can dispatch the specified methods. Data
-types must be defined, so the WSDL parts must point to XSD types.</li>
-<li><uicontrol>rpc encoded</uicontrol>. RPC style messages and SOAP encoding.
-Use this style of binding when you want to encode data graphs in your SOAP
-messages so a server can deserialize the object data. Data types must be
-defined, so the WSDL parts must point to XSD types.</li>
-</ul></info></substep>
-<substep><cmd></cmd><info>If you select HTTP you can select whether to create
-an HTTP getter or setter.<ul>
-<li><uicontrol>HTTP GET</uicontrol>. A GET request fetches data from a Web
-server based on an URL value and a set of HTTP headers. Use this method when
-you want to retrieve information specified in the request. </li>
-<li><uicontrol>HTTP POST</uicontrol>. A POST request sends additional data
-to the server, specified after the URL and the headers. Use this method when
-you want to send data enclosed in the body of the request.</li>
-</ul></info></substep>
-</substeps>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><info>The WSDL file
-opens in the WSDL editor.</info></step>
-</steps>
-<result><p>If you created a WSDL file with a skeleton using SOAP bindings,
-it should look similar to the following:</p><p><image alt="Image of a WSDL skeleton using SOAP bindings"
-href="../images/soapskel.gif" placement="break"></image></p><p>If you created
-a WSDL file with a skeleton using HTTP bindings, it should look similar to
-the following:</p><p><image alt="Image of a WSDL skeleton using HTTP bindings"
-href="../images/httpskel.gif" placement="break"></image></p></result>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.dita" scope="peer">
-<linktext>WSDL</linktext></link>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="timpwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html
deleted file mode 100644
index 4fe908b..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a new WSDL file" />
-<meta name="abstract" content="You can create a new, empty WSDL file, then edit it using the WSDL editor." />
-<meta name="description" content="You can create a new, empty WSDL file, then edit it using the WSDL editor." />
-<meta content="WSDL files, creating, Web services, creating WSDL files" name="DC.subject" />
-<meta content="WSDL files, creating, Web services, creating WSDL files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="../concepts/cwsdled.html" />
-<meta scheme="URI" name="DC.Relation" content="timpwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcrtwsdl" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a new WSDL file</title>
-</head>
-<body id="tcrtwsdl"><a name="tcrtwsdl"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a new WSDL file</h1>
-
-
-
-<div><p>You can create a new, empty WSDL file, then edit it using the WSDL
-editor.</p>
-
-<div class="section"><p>To create a WSDL file, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Create a project to contain the WSDL document.</span> It does
-not matter what kind of project you create.</li>
-
-<li class="stepexpand"><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span></span> and select <span class="menucascade">
-<span class="uicontrol">Web Services</span> > <span class="uicontrol">WSDL</span></span>.</span>
- Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>Select the project or folder that will contain the WSDL file.</span>
- In the <span class="uicontrol">File name</span> field, type the name of the
-WSDL file. The name of your XML file must end in <tt class="sysout">.wsdl</tt>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span> and enter the following information
-on the next page of the wizard:</span>
-<ol type="a">
-<li class="substepexpand"><span>A <span class="uicontrol">Target namespace</span> for the WSDL file
-or accept the default (<samp class="codeph">http://www.example.org/<em>MyWSDLFile</em>/</samp>).</span>
- The target namespace is used for the names of messages and the port
-type, binding and service defined in the WSDL file. The value must take the
-form of a valid URI (for example, <samp class="codeph">http://www.mycompany.com/myservice/</samp>)
-</li>
-
-<li class="substepexpand"><span>The <span class="uicontrol">Prefix</span> associated with the target
-namespace.</span></li>
-
-<li class="substepexpand"><span>Select <span class="uicontrol">Create WSDL Skeleton</span> if you want
-the wizard to create the skeleton of the WSDL file.</span> This will generate
-the WSDL elements required for your service, including bindings, ports and
-messages. You can then modify these to meet the requirements of your Web service
-.</li>
-
-<li class="substepexpand"><span>If you have chosen to create a WSDL skeleton, select the binding
-options you want to use in the <span class="uicontrol">Protocol</span> drop down.
-The options are SOAP and HTTP. Use the SOAP protocol when you want to exchange
-structured and typed information. Use the HTTP protocol when you want your
-application client to just request or update information.</span></li>
-
-<li class="substepexpand"><span /> If you select SOAP you can then select the encoding
-style you want to use:<ul>
-<li><span class="uicontrol">document literal</span>. Document style messages, literal
-encoding. Use this style of binding when you want to send SOAP messages that
-can be validated by an XML validator. All the data types in the SOAP message
-body are defined in a schema, so the WSDL parts must point to schema elements. </li>
-
-<li><span class="uicontrol">rpc literal</span>. RPC style messages, literal encoding.
-Use this style of binding when you want to specify the operation method names
-in your SOAP messages so a server can dispatch the specified methods. Data
-types must be defined, so the WSDL parts must point to XSD types.</li>
-
-<li><span class="uicontrol">rpc encoded</span>. RPC style messages and SOAP encoding.
-Use this style of binding when you want to encode data graphs in your SOAP
-messages so a server can deserialize the object data. Data types must be
-defined, so the WSDL parts must point to XSD types.</li>
-
-</ul>
-</li>
-
-<li class="substepexpand"><span /> If you select HTTP you can select whether to create
-an HTTP getter or setter.<ul>
-<li><span class="uicontrol">HTTP GET</span>. A GET request fetches data from a Web
-server based on an URL value and a set of HTTP headers. Use this method when
-you want to retrieve information specified in the request. </li>
-
-<li><span class="uicontrol">HTTP POST</span>. A POST request sends additional data
-to the server, specified after the URL and the headers. Use this method when
-you want to send data enclosed in the body of the request.</li>
-
-</ul>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span> The WSDL file
-opens in the WSDL editor.</li>
-
-</ol>
-
-<div class="section"><p>If you created a WSDL file with a skeleton using SOAP bindings,
-it should look similar to the following:</p>
-<p><br /><img src="../images/soapskel.gif" alt="Image of a WSDL skeleton using SOAP bindings" /><br /></p>
-<p>If you created
-a WSDL file with a skeleton using HTTP bindings, it should look similar to
-the following:</p>
-<p><br /><img src="../images/httpskel.gif" alt="Image of a WSDL skeleton using HTTP bindings" /><br /></p>
-</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div>
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="timpwsdl.html" title="You can import WSDL files into the workbench and open them in the WSDL editor. Opening them in the WSDL editor provides you with an opportunity to have a structured viewing of the WSDL file.">Importing a WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.dita
deleted file mode 100644
index d8809d0..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.dita
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tedtwsdl" xml:lang="en-us">
-<title>Editing WSDL files</title>
-<shortdesc>Once you have created a WSDL file, you can edit it in the WSDL
-editor. You can also import WSDL files you have created into the workbench
-and edit them in the WSDL editor.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>WSDL files<indexterm>editing</indexterm></indexterm>
-<indexterm>Web services<indexterm>editing WSDL files</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>To open a WSDL file in the WSDL editor, double-click it in the
-Navigator view or right-click it and click <b>Open With > WSDL Editor.</b></p></context>
-</taskbody>
-<task id="editisourceview">
-<title>Editing in the Source view</title>
-<taskbody>
-<context>To edit a WSDL file in the Source view, complete the following steps:</context>
-<steps>
-<step><cmd>Open your WSDL file in the WSDL editor.</cmd></step>
-<step><cmd>Click the <uicontrol>Source</uicontrol> tab.</cmd></step>
-<step><cmd>Select the source code you want to edit.</cmd></step>
-</steps>
-<result><p>At any time, you can switch to the Source view to review the source
-code of the WSDL file. You can also edit your WSDL file directly in the Source
-view.</p></result>
-</taskbody>
-</task>
-<task id="editeditview">
-<title>Editing in the Design view</title>
-<taskbody>
-<context><p>The Design view provides a graphical way to browse and edit your
-WSDL file. Each type of top level WSDL object is shown within a tabular view
-(for example, service, binding, port type). Each tabular view contains one
-or more rows that represent the structure of the object. The service, binding,
-and port type objects are 'linked'. A line displays to denote a reference
-(or association) between these objects.</p><p> <image alt="Image of a WSDL file open in the WSDL editor"
-href="../images/wsdleditor.gif" placement="break"></image></p></context>
-</taskbody>
-</task>
-<task id="editpropertiesview">
-<title>Editing in the Properties view</title>
-<taskbody>
-<context><p>The Properties view displays a list of attributes and editable
-attribute values of a selected WSDL object and contains the following panes
-to edit:</p><ul>
-<li> <uicontrol>General</uicontrol> pane, which displays a list of object
-attributes.</li>
-<li> <uicontrol>Documentation</uicontrol> pane, which specifies the information
-you want the user to read.</li>
-<li> <uicontrol>Extensions</uicontrol> pane, which is used to add extension
-components.</li>
-</ul><draft-comment> [Legacy Title] Showing Bindings in the Design [Legacy
-Context]By default bindings are shown in the Design View. Select the show/hide
-binding button at the top left of the Design View to hide the bindings. With
-the bindings hidden a service can be browsed from a purely abstract level
-without showing binding information. When the need arises to understand the
-concrete details represented by the binding, select the show/hide binding
-button again to make them visible. view [Writer comments] Remove topic "Showing
-bindings..." because there is no show/hide binding function in the new GUI</draft-comment></context>
-</taskbody>
-</task>
-<task id="editoutlineview" xml:lang="en-us">
-<title>Editing in the Outline view</title>
-<taskbody>
-<context><p>The Outline view will show you all the items in your WSDL file
-as you add them. In this view, you can both create and delete WSDL components.</p><p>The
-Outline view contains the following folders you can use (by right-clicking
-and selecting the appropriate option) to edit your WSDL file:</p><ul>
-<li> <b>Imports</b> statements, which are used to associate a namespace
-with a document location.</li>
-<li> <b>Types</b>, which provide data type definitions used to describe the
-messages exchanged. You cannot edit any types directly using this folder.</li>
-<li> <b>Services</b>, which are used to aggregate a set of related ports.</li>
-<li> <b>Bindings</b>, which specify concrete protocol and data format specifications
-for the operations and messages defined by a particular port type.</li>
-<li> <b>Port Type</b>, which is a set of abstract operations. Each operation
-refers to an input message and output messages. </li>
-<li> <b>Messages</b>, which represent an abstract definition of the data being
-transmitted. A message consists of logical parts, each of which is associated
-with a definition within some type system.</li>
-</ul></context>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.dita" scope="peer">
-<linktext>WSDL</linktext></link>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="timpwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html
deleted file mode 100644
index a9e16c8..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing WSDL files" />
-<meta name="abstract" content="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor." />
-<meta name="description" content="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor." />
-<meta content="WSDL files, editing, Web services, editing WSDL files" name="DC.subject" />
-<meta content="WSDL files, editing, Web services, editing WSDL files" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtwsdl" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing WSDL files</title>
-</head>
-<body id="tedtwsdl"><a name="tedtwsdl"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing WSDL files</h1>
-
-
-
-<div><p>Once you have created a WSDL file, you can edit it in the WSDL
-editor. You can also import WSDL files you have created into the workbench
-and edit them in the WSDL editor.</p>
-
-<div class="section"><p>To open a WSDL file in the WSDL editor, double-click it in the
-Navigator view or right-click it and click <strong>Open With > WSDL Editor.</strong></p>
-</div>
-
-</div>
-
-<div class="nested1" id="editisourceview"><a name="editisourceview"><!-- --></a>
-<h2 class="topictitle2">Editing in the Source view</h2>
-
-<div>
-<div class="section">To edit a WSDL file in the Source view, complete the following steps:</div>
-
-<ol>
-<li><span>Open your WSDL file in the WSDL editor.</span></li>
-
-<li><span>Click the <span class="uicontrol">Source</span> tab.</span></li>
-
-<li><span>Select the source code you want to edit.</span></li>
-
-</ol>
-
-<div class="section"><p>At any time, you can switch to the Source view to review the source
-code of the WSDL file. You can also edit your WSDL file directly in the Source
-view.</p>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div>
-</div>
-</div>
-</div>
-
-<div class="nested1" id="editeditview"><a name="editeditview"><!-- --></a>
-<h2 class="topictitle2">Editing in the Design view</h2>
-
-<div>
-<div class="section"><p>The Design view provides a graphical way to browse and edit your
-WSDL file. Each type of top level WSDL object is shown within a tabular view
-(for example, service, binding, port type). Each tabular view contains one
-or more rows that represent the structure of the object. The service, binding,
-and port type objects are 'linked'. A line displays to denote a reference
-(or association) between these objects.</p>
-<p> <br /><img src="../images/wsdleditor.gif" alt="Image of a WSDL file open in the WSDL editor" /><br /></p>
-</div>
-
-</div>
-
-</div>
-
-<div class="nested1" id="editpropertiesview"><a name="editpropertiesview"><!-- --></a>
-<h2 class="topictitle2">Editing in the Properties view</h2>
-
-<div>
-<div class="section"><p>The Properties view displays a list of attributes and editable
-attribute values of a selected WSDL object and contains the following panes
-to edit:</p>
-<ul>
-<li> <span class="uicontrol">General</span> pane, which displays a list of object
-attributes.</li>
-
-<li> <span class="uicontrol">Documentation</span> pane, which specifies the information
-you want the user to read.</li>
-
-<li> <span class="uicontrol">Extensions</span> pane, which is used to add extension
-components.</li>
-
-</ul>
-</div>
-
-</div>
-
-</div>
-
-<div class="nested1" xml:lang="en-us" id="editoutlineview"><a name="editoutlineview"><!-- --></a>
-<h2 class="topictitle2">Editing in the Outline view</h2>
-
-<div>
-<div class="section"><p>The Outline view will show you all the items in your WSDL file
-as you add them. In this view, you can both create and delete WSDL components.</p>
-<p>The
-Outline view contains the following folders you can use (by right-clicking
-and selecting the appropriate option) to edit your WSDL file:</p>
-<ul>
-<li> <strong>Imports</strong> statements, which are used to associate a namespace
-with a document location.</li>
-
-<li> <strong>Types</strong>, which provide data type definitions used to describe the
-messages exchanged. You cannot edit any types directly using this folder.</li>
-
-<li> <strong>Services</strong>, which are used to aggregate a set of related ports.</li>
-
-<li> <strong>Bindings</strong>, which specify concrete protocol and data format specifications
-for the operations and messages defined by a particular port type.</li>
-
-<li> <strong>Port Type</strong>, which is a set of abstract operations. Each operation
-refers to an input message and output messages. </li>
-
-<li> <strong>Messages</strong>, which represent an abstract definition of the data being
-transmitted. A message consists of logical parts, each of which is associated
-with a definition within some type system.</li>
-
-</ul>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div>
-</div>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div>
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="timpwsdl.html" title="You can import WSDL files into the workbench and open them in the WSDL editor. Opening them in the WSDL editor provides you with an opportunity to have a structured viewing of the WSDL file.">Importing a WSDL file</a></div></div>
-</div>
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.dita
deleted file mode 100644
index 6d2eb58..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.dita
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="timpwsdl" xml:lang="en-us">
-<title>Importing a WSDL file</title>
-<titlealts>
-<searchtitle>Importing WSDL files</searchtitle>
-</titlealts>
-<shortdesc>You can import WSDL files into the workbench and open them in the
-WSDL editor. Opening them in the WSDL editor provides you with an opportunity
-to have a structured viewing of the WSDL file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>WSDL files<indexterm>importing</indexterm></indexterm>
-<indexterm>Web services<indexterm>importing WSDL files</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>The Web Service wizard assists you in creating a new Web service
-from a WSDL file. You must first create or import a WSDL file. A WSDL file
-can be created using the WSDL editor. This is described in: <xref href="../tasks/tcrtwsdl.dita"
-scope="peer">Creating a new WSDL file</xref>. To import a WSDL file follow
-the instructions below.</p><p> <uicontrol>Prerequisite:</uicontrol> Create
-a project. It is recommend that you create a Web project so that the WSDL
-can be easily used to generate additional artifacts and deployed.</p><p>For
-more information on creating a Web project, refer to the Web application development
-documentation.</p><p>To import a WSDL file to your Web project, complete the
-following steps:</p></context>
-<steps>
-<step><cmd>Select your project in the Java EE Navigator pane, and from the <uicontrol>File</uicontrol> menu,
-select <uicontrol>Import</uicontrol>.</cmd></step>
-<step><cmd>Select <menucascade><uicontrol>General</uicontrol><uicontrol>File
-System</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>Click <uicontrol>Browse</uicontrol> on the next page of the wizard
-to select the directories from which you would like to add the WSDL.</cmd>
-</step>
-<step><cmd>In the import selection panes, use the following methods to select
-exactly the resources you want to add: </cmd><info><ul>
-<li>Expand the hierarchies in the left pane and select or clear the checkboxes
-that represent the folders in the selected directory. Then in the right pane,
-select or clear check boxes for individual files.</li>
-<li>Click <uicontrol>Filter Types</uicontrol> to filter the current selection
-for files of a specific type.</li>
-<li>Click <uicontrol>Select All</uicontrol> to select all resources in the
-directory, then go through and deselect the ones that you do not want to add.</li>
-<li>Click <uicontrol>Deselect All</uicontrol> to deselect all resources in
-the directory, then go through and choose individual resources to add.</li>
-</ul></info></step>
-<step><cmd>Specify the Workbench project or folder that will be the import
-destination.</cmd></step>
-<step><cmd>When you have finished specifying your import options, click <uicontrol>Finish.</uicontrol></cmd>
-</step>
-</steps>
-<result><p>Alternately, you can import a WSDL file using the WSDL Explorer.
-For more information, refer to: <xref href="../../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.dita"
-scope="peer"> Using the WSDL Explorer</xref>. </p></result>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.dita" scope="peer">
-<linktext>WSDL</linktext></link>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html
deleted file mode 100644
index b28b73a..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing a WSDL file" />
-<meta name="abstract" content="You can import WSDL files into the workbench and open them in the WSDL editor. Opening them in the WSDL editor provides you with an opportunity to have a structured viewing of the WSDL file." />
-<meta name="description" content="You can import WSDL files into the workbench and open them in the WSDL editor. Opening them in the WSDL editor provides you with an opportunity to have a structured viewing of the WSDL file." />
-<meta content="WSDL files, importing, Web services, importing WSDL files" name="DC.subject" />
-<meta content="WSDL files, importing, Web services, importing WSDL files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="../concepts/cwsdled.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrtwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtwsdl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="timpwsdl" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing WSDL files</title>
-</head>
-<body id="timpwsdl"><a name="timpwsdl"><!-- --></a>
-
-
-<h1 class="topictitle1">Importing a WSDL file</h1>
-
-
-
-
-<div><p>You can import WSDL files into the workbench and open them in the
-WSDL editor. Opening them in the WSDL editor provides you with an opportunity
-to have a structured viewing of the WSDL file.</p>
-
-<div class="section"><p>The Web Service wizard assists you in creating a new Web service
-from a WSDL file. You must first create or import a WSDL file. A WSDL file
-can be created using the WSDL editor. This is described in: <a href="../tasks/tcrtwsdl.html">Creating a new WSDL file</a>. To import a WSDL file follow
-the instructions below.</p>
-<p> <span class="uicontrol">Prerequisite:</span> Create
-a project. It is recommend that you create a Web project so that the WSDL
-can be easily used to generate additional artifacts and deployed.</p>
-<p>For
-more information on creating a Web project, refer to the Web application development
-documentation.</p>
-<p>To import a WSDL file to your Web project, complete the
-following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Select your project in the Java EE Navigator pane, and from the <span class="uicontrol">File</span> menu,
-select <span class="uicontrol">Import</span>.</span></li>
-
-<li class="stepexpand"><span>Select <span class="menucascade"><span class="uicontrol">General</span> > <span class="uicontrol">File
-System</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Browse</span> on the next page of the wizard
-to select the directories from which you would like to add the WSDL.</span>
-</li>
-
-<li class="stepexpand"><span>In the import selection panes, use the following methods to select
-exactly the resources you want to add: </span> <ul>
-<li>Expand the hierarchies in the left pane and select or clear the checkboxes
-that represent the folders in the selected directory. Then in the right pane,
-select or clear check boxes for individual files.</li>
-
-<li>Click <span class="uicontrol">Filter Types</span> to filter the current selection
-for files of a specific type.</li>
-
-<li>Click <span class="uicontrol">Select All</span> to select all resources in the
-directory, then go through and deselect the ones that you do not want to add.</li>
-
-<li>Click <span class="uicontrol">Deselect All</span> to deselect all resources in
-the directory, then go through and choose individual resources to add.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Specify the Workbench project or folder that will be the import
-destination.</span></li>
-
-<li class="stepexpand"><span>When you have finished specifying your import options, click <span class="uicontrol">Finish.</span></span>
-</li>
-
-</ol>
-
-<div class="section"><p>Alternately, you can import a WSDL file using the WSDL Explorer.
-For more information, refer to: <a href="../../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html">Using the WSDL Explorer</a>. </p>
-</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div>
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.dita
deleted file mode 100644
index 5de2837..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.dita
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tsetbind" xml:lang="en-us">
-<title>Setting a binding</title>
-<shortdesc>A binding is a top level WSDL object that provides a concrete specification
-regarding the transmission of messages to and from a web service. A binding
-references exactly one port type. The structure of a binding corresponds very
-closely to that of the port type. The binding contains extensibility elements
-(for example, SOAP, http, and mime) that specify protocol specific details.
-Each port within a service references exactly one binding.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Web services<indexterm>bindings<indexterm>creating</indexterm></indexterm><indexterm>setting
-WSDL bindings</indexterm></indexterm><indexterm>WSDL files<indexterm>bindings</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>You can create a binding by right clicking in any blank space
-in the Design view and selecting <uicontrol>Add Binding</uicontrol>. You can
-create a new binding, reuse an existing one, or import one. </p></context>
-</taskbody>
-<task id="createnewbind">
-<title>Creating a new binding</title>
-<taskbody>
-<context><p>To create a new binding for your port, complete the following
-steps:</p></context>
-<steps>
-<step><cmd>In the Design view, right-click your port and click <b>Set Binding
-> New Binding</b>.</cmd></step>
-<step><cmd>In the <b>Name</b> field, type the name of the binding.</cmd><info>The
-name should be unique among all bindings defined within the enclosing WSDL
-document. Click <b>OK.</b> To select the new binding, click the binding object.</info>
-</step>
-<step><cmd>Type any information about the binding you want the user to read
-in the <b>Documentation</b> pane.</cmd></step>
-</steps>
-<result><note>A <b>PortType</b> is a named set of abstract operations and
-the abstract messages involved. You can either create a new port type for
-your binding, reuse an existing one, or import one. For more information,
-see <xref format="dita" href="tsetprtt.dita" scope="local">Setting a Port
-Type</xref>.</note><note type="tip">You can also create a new binding for
-your port using the Outline view. Right click on the <uicontrol>Bindings</uicontrol> folder
-and select <uicontrol>Add Binding</uicontrol>.</note></result>
-</taskbody>
-</task>
-<task id="reusebinding">
-<title>Reusing a binding for a port</title>
-<taskbody>
-<context><p>To reuse a binding for your port, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the Design view, select your port.</cmd></step>
-<step><cmd>In the Properties view, click the <b>General</b> pane.</cmd></step>
-<step><cmd>From the <b>Binding</b> drop down list, select the binding you
-want to use.</cmd></step>
-</steps>
-</taskbody>
-</task>
-<task id="regeneratingabinding">
-<title>Regenerating a binding</title>
-<taskbody>
-<context>To regenerate a binding, complete the following steps:</context>
-<steps>
-<step><cmd>Right-click the binding you want to regenerate.</cmd></step>
-<step><cmd>Select <uicontrol>Generate Binding Content</uicontrol>.</cmd></step>
-<step><cmd>Specify the required binding information. If you are modifying
-an existing binding, select the <uicontrol>Overwrite existing binding information</uicontrol> check
-box.</cmd></step>
-</steps>
-</taskbody>
-</task>
-<task id="impbinding">
-<title>Import an existing binding</title>
-<taskbody>
-<context>To import an existing binding for your port, complete the following
-steps:</context>
-<steps>
-<step><cmd>In the Design view, right-click your port and click <b>Set Binding
-> Existing Binding.</b></cmd></step>
-<step importance="optional"><cmd>In the <b>Name</b> field, type a search string
-to filter the list or leave the field blank to view all.</cmd></step>
-<step><cmd>You can import a binding by selecting one of the following options:</cmd>
-<choices>
-<choice><b>Workspace</b>: lists the bindings available in your workspace.</choice>
-<choice><b>Enclosing Project</b>: lists the bindings available in the project
-that contains your file.</choice>
-<choice><b>Current Resource</b>: lists the binding types available in your
-current file.</choice>
-<choice><b>Working Sets</b>: lists the bindings available in a specified set
-of files. To specify a working set, click <b>Choose</b>. You can select files
-from an existing working set or create a new working set. Once you have selected
-the files, click <b>OK</b>.</choice>
-</choices>
-</step>
-<step><cmd>The bindings will be listed. Select one and click <b>OK</b>. In
-the Design view, click the binding object.</cmd></step>
-<step><cmd>In the Properties view, type any information about the binding
-you wish the user to read in the <b>Documentation</b> pane.</cmd></step>
-</steps>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html
deleted file mode 100644
index c689501..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting a binding" />
-<meta name="abstract" content="A binding is a top level WSDL object that provides a concrete specification regarding the transmission of messages to and from a web service. A binding references exactly one port type. The structure of a binding corresponds very closely to that of the port type. The binding contains extensibility elements (for example, SOAP, http, and mime) that specify protocol specific details. Each port within a service references exactly one binding." />
-<meta name="description" content="A binding is a top level WSDL object that provides a concrete specification regarding the transmission of messages to and from a web service. A binding references exactly one port type. The structure of a binding corresponds very closely to that of the port type. The binding contains extensibility elements (for example, SOAP, http, and mime) that specify protocol specific details. Each port within a service references exactly one binding." />
-<meta content="Web services, bindings, creating, setting WSDL bindings, WSDL files" name="DC.subject" />
-<meta content="Web services, bindings, creating, setting WSDL bindings, WSDL files" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsetbind" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting a binding</title>
-</head>
-<body id="tsetbind"><a name="tsetbind"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting a binding</h1>
-
-
-
-<div><p>A binding is a top level WSDL object that provides a concrete specification
-regarding the transmission of messages to and from a web service. A binding
-references exactly one port type. The structure of a binding corresponds very
-closely to that of the port type. The binding contains extensibility elements
-(for example, SOAP, http, and mime) that specify protocol specific details.
-Each port within a service references exactly one binding.</p>
-
-<div class="section"><p>You can create a binding by right clicking in any blank space
-in the Design view and selecting <span class="uicontrol">Add Binding</span>. You can
-create a new binding, reuse an existing one, or import one. </p>
-</div>
-
-</div>
-
-<div class="nested1" id="createnewbind"><a name="createnewbind"><!-- --></a>
-<h2 class="topictitle2">Creating a new binding</h2>
-
-<div>
-<div class="section"><p>To create a new binding for your port, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click your port and click <strong>Set Binding
-> New Binding</strong>.</span></li>
-
-<li class="stepexpand"><span>In the <strong>Name</strong> field, type the name of the binding.</span> The
-name should be unique among all bindings defined within the enclosing WSDL
-document. Click <strong>OK.</strong> To select the new binding, click the binding object.
-</li>
-
-<li class="stepexpand"><span>Type any information about the binding you want the user to read
-in the <strong>Documentation</strong> pane.</span></li>
-
-</ol>
-
-<div class="section"><div class="note"><span class="notetitle">Note:</span> A <strong>PortType</strong> is a named set of abstract operations and
-the abstract messages involved. You can either create a new port type for
-your binding, reuse an existing one, or import one. For more information,
-see <a href="tsetprtt.dita">Setting a Port Type</a>.</div>
-<div class="tip"><span class="tiptitle">Tip:</span> You can also create a new binding
-for your port using the Outline view. Right click on the <span class="uicontrol">Bindings</span> folder
-and select <span class="uicontrol">Add Binding</span>.</div>
-</div>
-
-</div>
-
-</div>
-
-<div class="nested1" id="reusebinding"><a name="reusebinding"><!-- --></a>
-<h2 class="topictitle2">Reusing a binding for a port</h2>
-
-<div>
-<div class="section"><p>To reuse a binding for your port, complete the following steps:</p>
-</div>
-
-<ol>
-<li><span>In the Design view, select your port.</span></li>
-
-<li><span>In the Properties view, click the <strong>General</strong> pane.</span></li>
-
-<li><span>From the <strong>Binding</strong> drop down list, select the binding you
-want to use.</span></li>
-
-</ol>
-
-</div>
-
-</div>
-
-<div class="nested1" id="regeneratingabinding"><a name="regeneratingabinding"><!-- --></a>
-<h2 class="topictitle2">Regenerating a binding</h2>
-
-<div>
-<div class="section">To regenerate a binding, complete the following steps:</div>
-
-<ol>
-<li><span>Right-click the binding you want to regenerate.</span></li>
-
-<li><span>Select <span class="uicontrol">Generate Binding Content</span>.</span></li>
-
-<li><span>Specify the required binding information. If you are modifying
-an existing binding, select the <span class="uicontrol">Overwrite existing binding information</span> check
-box.</span></li>
-
-</ol>
-
-</div>
-
-</div>
-
-<div class="nested1" id="impbinding"><a name="impbinding"><!-- --></a>
-<h2 class="topictitle2">Import an existing binding</h2>
-
-<div>
-<div class="section">To import an existing binding for your port, complete the following
-steps:</div>
-
-<ol>
-<li><span>In the Design view, right-click your port and click <strong>Set Binding
-> Existing Binding.</strong></span></li>
-
-<li><strong>Optional: </strong><span>In the <strong>Name</strong> field, type a search string
-to filter the list or leave the field blank to view all.</span></li>
-
-<li><span>You can import a binding by selecting one of the following options:</span>
-<ul>
-<li><strong>Workspace</strong>: lists the bindings available in your workspace.</li>
-
-<li><strong>Enclosing Project</strong>: lists the bindings available in the project
-that contains your file.</li>
-
-<li><strong>Current Resource</strong>: lists the binding types available in your
-current file.</li>
-
-<li><strong>Working Sets</strong>: lists the bindings available in a specified set
-of files. To specify a working set, click <strong>Choose</strong>. You can select files
-from an existing working set or create a new working set. Once you have selected
-the files, click <strong>OK</strong>.</li>
-
-</ul>
-
-</li>
-
-<li><span>The bindings will be listed. Select one and click <strong>OK</strong>. In
-the Design view, click the binding object.</span></li>
-
-<li><span>In the Properties view, type any information about the binding
-you wish the user to read in the <strong>Documentation</strong> pane.</span></li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.dita b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.dita
deleted file mode 100644
index 98973fa..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.dita
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tsetprtt" xml:lang="en-us">
-<title>Setting a port type</title>
-<shortdesc>A port type is a named set of abstract operations and the abstract
-messages involved. Each operation refers to an input message and output messages.
-A port type is referenced by a binding object. Each binding references exactly
-one port type. Since each port refers to exactly one binding, each port has
-exactly one port type.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>WSDL files<indexterm>setting port types</indexterm></indexterm>
-<indexterm>Web services<indexterm>setting port types</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>You can create a port type by right clicking in any blank space
-in the Design view and selecting <uicontrol>Add PortType</uicontrol>. As a
-convenience you can also add a port type via a binding. This allows you to
-create a port type and modify the binding to reference the new port type in
-one action. You can either create a new port type for your binding, re-use
-an existing one, or import one.</p></context>
-</taskbody>
-<task id="createporttype">
-<title>Create a new port type for a binding</title>
-<taskbody>
-<context><p>If you want to create a new port type for your binding, complete
-the following steps:</p></context>
-<steps>
-<step><cmd>In the Design view, right-click on a binding object (note that
-port must reference a binding) and click <b>Set PortType > New PortType</b>.</cmd>
-</step>
-<step><cmd>Type the name of the port type in the <b>Name</b> field and click <b>OK</b>.</cmd>
-<info>The name should be unique name among all port types defined within in
-the enclosing WSDL document. To select the new port type, click the port type
-object.</info></step>
-<step><cmd>In the Properties view, type any information about the port type
-you wish the user to read in the <b>Documentation</b> pane.</cmd></step>
-</steps>
-<result> <note type="tip">You can also create a new port type for your binding
-using the Outline view.</note><p>Once you have created a port type, you can
-add operations to it, which can send and receive messages.</p></result>
-</taskbody>
-</task>
-<task id="reuseporttype">
-<title>Reuse a port type for a binding</title>
-<taskbody>
-<context><p>If you want to reuse a port type for your binding, complete the
-following steps:</p></context>
-<steps>
-<step><cmd>In the Design view, right-click on a binding object (note that
-port must reference a binding) and click <b>Set Port Type > Existing PortType</b>.</cmd>
-</step>
-<step importance="optional"><cmd>In the <b>Name</b> field, type a search string
-to filter the list or leave the field blank to view all.</cmd></step>
-<step><cmd>You can change the scope of the list by selecting one of the following
-options:</cmd>
-<choices>
-<choice><b>Workspace</b>: lists the port types available in your workspace.</choice>
-<choice><b>Enclosing Project</b>: lists the port types available in the project
-that contains your file.</choice>
-<choice><b>Current Resource</b>: lists the port types available in your current
-file.</choice>
-<choice><b>Working Sets</b>: lists the port types available in a specified
-set of files. To specify a working set, click <b>Choose</b>. You can select
-files from an existing working set or create a new working set. Once you have
-selected the files, click <b>OK</b>.</choice>
-</choices>
-</step>
-<step><cmd>The existing port types will be listed. Select one and click <b>OK</b>.</cmd>
-</step>
-</steps>
-</taskbody>
-</task>
-<task id="importporttype">
-<title>Import a port type for a binding</title>
-<taskbody>
-<context><p>If you want to import an existing port type for your binding,
-complete the following steps:</p></context>
-<steps>
-<step><cmd>In the Design view, right-click on a binding object (note that
-port must reference a binding) and click <b>Set Port Type > Existing PortType.</b></cmd>
-</step>
-<step importance="optional"><cmd>In the <b>Name</b> field, type a search string
-to filter the list or leave the field blank to view all.</cmd></step>
-<step><cmd>You can import a port type by selecting one of the following options:</cmd>
-<choices>
-<choice><b>Workspace</b>: lists the port types available in your workspace.</choice>
-<choice><b>Enclosing Project</b>: lists the port types available in the project
-that contains your file.</choice>
-<choice><b>Working Sets</b>: lists the port types available in a specified
-set of files. To specify a working set, click <b>Choose</b>. You can select
-files from an existing working set or create a new working set. Once you have
-selected the files, click <b>OK</b>.</choice>
-</choices>
-</step>
-<step><cmd>The port types will be listed. Select one and click <b>OK</b>.
-In the Design view, click the port type object.</cmd></step>
-<step><cmd>In the Properties view, type any information about the port type
-you wish the user to read in the <b>Documentation</b> pane.</cmd></step>
-</steps>
-</taskbody>
-<related-links>
-<linklist><title>Related concepts</title>
-<link href="../concepts/cwsdled.dita" scope="local"></link>
-</linklist>
-<linklist><title>Related tasks</title>
-<link href="tcrtwsdl.dita" scope="local"></link>
-<link href="tedtwsdl.dita" scope="local"></link>
-</linklist>
-</related-links>
-</task>
-</task>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html
deleted file mode 100644
index 8e29bb3..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting a port type" />
-<meta name="abstract" content="A port type is a named set of abstract operations and the abstract messages involved. Each operation refers to an input message and output messages. A port type is referenced by a binding object. Each binding references exactly one port type. Since each port refers to exactly one binding, each port has exactly one port type." />
-<meta name="description" content="A port type is a named set of abstract operations and the abstract messages involved. Each operation refers to an input message and output messages. A port type is referenced by a binding object. Each binding references exactly one port type. Since each port refers to exactly one binding, each port has exactly one port type." />
-<meta content="WSDL files, setting port types, Web services" name="DC.subject" />
-<meta content="WSDL files, setting port types, Web services" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsetprtt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting a port type</title>
-</head>
-<body id="tsetprtt"><a name="tsetprtt"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting a port type</h1>
-
-
-
-<div><p>A port type is a named set of abstract operations and the abstract
-messages involved. Each operation refers to an input message and output messages.
-A port type is referenced by a binding object. Each binding references exactly
-one port type. Since each port refers to exactly one binding, each port has
-exactly one port type.</p>
-
-<div class="section"><p>You can create a port type by right clicking in any blank space
-in the Design view and selecting <span class="uicontrol">Add PortType</span>. As a
-convenience you can also add a port type via a binding. This allows you to
-create a port type and modify the binding to reference the new port type in
-one action. You can either create a new port type for your binding, re-use
-an existing one, or import one.</p>
-</div>
-
-</div>
-
-<div class="nested1" id="createporttype"><a name="createporttype"><!-- --></a>
-<h2 class="topictitle2">Create a new port type for a binding</h2>
-
-<div>
-<div class="section"><p>If you want to create a new port type for your binding, complete
-the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click on a binding object (note that
-port must reference a binding) and click <strong>Set PortType > New PortType</strong>.</span>
-</li>
-
-<li class="stepexpand"><span>Type the name of the port type in the <strong>Name</strong> field and click <strong>OK</strong>.</span>
- The name should be unique name among all port types defined within in
-the enclosing WSDL document. To select the new port type, click the port type
-object.</li>
-
-<li class="stepexpand"><span>In the Properties view, type any information about the port type
-you wish the user to read in the <strong>Documentation</strong> pane.</span></li>
-
-</ol>
-
-<div class="section"> <div class="tip"><span class="tiptitle">Tip:</span> You can also create a new port type for your binding
-using the Outline view.</div>
-<p>Once you have created a port type, you can
-add operations to it, which can send and receive messages.</p>
-</div>
-
-</div>
-
-</div>
-
-<div class="nested1" id="reuseporttype"><a name="reuseporttype"><!-- --></a>
-<h2 class="topictitle2">Reuse a port type for a binding</h2>
-
-<div>
-<div class="section"><p>If you want to reuse a port type for your binding, complete the
-following steps:</p>
-</div>
-
-<ol>
-<li><span>In the Design view, right-click on a binding object (note that
-port must reference a binding) and click <strong>Set Port Type > Existing PortType</strong>.</span>
-</li>
-
-<li><strong>Optional: </strong><span>In the <strong>Name</strong> field, type a search string
-to filter the list or leave the field blank to view all.</span></li>
-
-<li><span>You can change the scope of the list by selecting one of the following
-options:</span>
-<ul>
-<li><strong>Workspace</strong>: lists the port types available in your workspace.</li>
-
-<li><strong>Enclosing Project</strong>: lists the port types available in the project
-that contains your file.</li>
-
-<li><strong>Current Resource</strong>: lists the port types available in your current
-file.</li>
-
-<li><strong>Working Sets</strong>: lists the port types available in a specified
-set of files. To specify a working set, click <strong>Choose</strong>. You can select
-files from an existing working set or create a new working set. Once you have
-selected the files, click <strong>OK</strong>.</li>
-
-</ul>
-
-</li>
-
-<li><span>The existing port types will be listed. Select one and click <strong>OK</strong>.</span>
-</li>
-
-</ol>
-
-</div>
-
-</div>
-
-<div class="nested1" id="importporttype"><a name="importporttype"><!-- --></a>
-<h2 class="topictitle2">Import a port type for a binding</h2>
-
-<div>
-<div class="section"><p>If you want to import an existing port type for your binding,
-complete the following steps:</p>
-</div>
-
-<ol>
-<li><span>In the Design view, right-click on a binding object (note that
-port must reference a binding) and click <strong>Set Port Type > Existing PortType.</strong></span>
-</li>
-
-<li><strong>Optional: </strong><span>In the <strong>Name</strong> field, type a search string
-to filter the list or leave the field blank to view all.</span></li>
-
-<li><span>You can import a port type by selecting one of the following options:</span>
-<ul>
-<li><strong>Workspace</strong>: lists the port types available in your workspace.</li>
-
-<li><strong>Enclosing Project</strong>: lists the port types available in the project
-that contains your file.</li>
-
-<li><strong>Working Sets</strong>: lists the port types available in a specified
-set of files. To specify a working set, click <strong>Choose</strong>. You can select
-files from an existing working set or create a new working set. Once you have
-selected the files, click <strong>OK</strong>.</li>
-
-</ul>
-
-</li>
-
-<li><span>The port types will be listed. Select one and click <strong>OK</strong>.
-In the Design view, click the port type object.</span></li>
-
-<li><span>In the Properties view, type any information about the port type
-you wish the user to read in the <strong>Documentation</strong> pane.</span></li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/wsdl_build_toc.ditamap b/docs/org.eclipse.wst.wsdl.ui.doc.user/wsdl_build_toc.ditamap
deleted file mode 100644
index 1421721..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/wsdl_build_toc.ditamap
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map id="wsdlbuildmap" title="Used only to build plugin - not used in product">
-<topicref href="concepts/cwsdled.dita" navtitle="Web Services Description Language (WSDL) editor">
-</topicref>
-<topicref href="tasks/timpwsdl.dita" navtitle="Importing WSDL files"></topicref>
-<topicref href="tasks/tcrtwsdl.dita" navtitle="Creating WSDL files"></topicref>
-<topicref href="concepts/cwsdled.dita" navtitle="Web Services Description Language (WSDL) editor">
-<topicref href="tasks/tedtwsdl.dita" navtitle="Editing WSDL files">
-<topicref href="tasks/taddsrvc.dita" linking="none" navtitle="Adding a service">
-</topicref>
-<topicref href="tasks/taddport.dita" linking="none" navtitle="Adding a port to a service">
-</topicref>
-<topicref href="tasks/tsetprtt.dita" linking="none" navtitle="Setting a port type">
-</topicref>
-<topicref href="tasks/tsetbind.dita" linking="none" navtitle="Setting a binding">
-</topicref>
-<topicref href="tasks/taddoper.dita" linking="none" navtitle="Adding an operation">
-</topicref>
-<topicref href="tasks/taddmess.dita" linking="none" navtitle="Adding a message">
-</topicref>
-<topicref href="tasks/taddpart.dita" linking="none" navtitle="Adding a part to a message">
-</topicref>
-<topicref href="tasks/tcrtimpt.dita" linking="none" navtitle="Creating an import statement">
-</topicref>
-<topicref href="tasks/tcrttype.dita" linking="none" navtitle="Creating a new type for your WSDL file">
-</topicref>
-</topicref>
-</topicref>
-<topicref href="../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.dita"
-navtitle="Exploring WSDL using the Web Services Explorer" scope="peer"></topicref>
-</map>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/wsdl_build_toc.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/wsdl_build_toc.xml
deleted file mode 100644
index 749fe6d..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/wsdl_build_toc.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Used only to build plugin - not used in product" topic="concepts/cwsdled.html">
-<topic label="Editing WSDL files with the WSDL Editor" href="concepts/cwsdled.html"/>
-<topic label="Importing a WSDL file" href="tasks/timpwsdl.html"/>
-<topic label="Creating a new WSDL file" href="tasks/tcrtwsdl.html"/>
-<topic label="Editing WSDL files with the WSDL Editor" href="concepts/cwsdled.html">
-<topic label="Editing WSDL files" href="tasks/tedtwsdl.html">
-<topic label="Adding a service" href="tasks/taddsrvc.html"/>
-<topic label="Adding a port to a service" href="tasks/taddport.html"/>
-<topic label="Setting a port type" href="tasks/tsetprtt.html"/>
-<topic label="Setting a binding" href="tasks/tsetbind.html"/>
-<topic label="Adding an operation" href="tasks/taddoper.html"/>
-<topic label="Adding a message" href="tasks/taddmess.html"/>
-<topic label="Adding a part to a message" href="tasks/taddpart.html"/>
-<topic label="Creating an import statement" href="tasks/tcrtimpt.html"/>
-<topic label="Creating a new type for your WSDL file" href="tasks/tcrttype.html"/>
-</topic>
-</topic>
-<topic label="Exploring WSDL using the Web Services Explorer" href="../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.ditamap b/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.ditamap
deleted file mode 100644
index 48bf1f2..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.ditamap
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map anchorref="../org.eclipse.jst.ws.doc.user/webservice_toc.ditamap#wswsdleditorc"
-id="wswsdleditorc" title="wswsdleditorc">
-<topicref href="concepts/cwsdled.dita" navtitle="Web Services Description Language (WSDL) editor">
-</topicref>
-</map>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.xml
deleted file mode 100644
index 4a826b1..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wswsdleditorc" label="wswsdleditorc" topic="concepts/cwsdled.html">
-<topic label="Editing WSDL files with the WSDL Editor" href="concepts/cwsdled.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.ditamap b/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.ditamap
deleted file mode 100644
index 4970a52..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.ditamap
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map anchorref="../org.eclipse.jst.ws.doc.user/webservice_toc.ditamap#wswsdleditort"
-id="wswsdleditort" title="wswsdleditort">
-<topicref href="tasks/timpwsdl.dita" navtitle="Importing WSDL files"></topicref>
-<topicref href="tasks/tcrtwsdl.dita" navtitle="Creating WSDL files"></topicref>
-<topicref href="concepts/cwsdled.dita" navtitle="Web Services Description Language (WSDL) editor">
-<topicref href="tasks/tedtwsdl.dita" navtitle="Editing WSDL files">
-<topicref href="tasks/taddsrvc.dita" linking="none" navtitle="Adding a service">
-</topicref>
-<topicref href="tasks/taddport.dita" linking="none" navtitle="Adding a port to a service">
-</topicref>
-<topicref href="tasks/tsetprtt.dita" linking="none" navtitle="Setting a port type">
-</topicref>
-<topicref href="tasks/tsetbind.dita" linking="none" navtitle="Setting a binding">
-</topicref>
-<topicref href="tasks/taddoper.dita" linking="none" navtitle="Adding an operation">
-</topicref>
-<topicref href="tasks/taddmess.dita" linking="none" navtitle="Adding a message">
-</topicref>
-<topicref href="tasks/taddpart.dita" linking="none" navtitle="Adding a part to a message">
-</topicref>
-<topicref href="tasks/tcrtimpt.dita" linking="none" navtitle="Creating an import statement">
-</topicref>
-<topicref href="tasks/tcrttype.dita" linking="none" navtitle="Creating a new type for your WSDL file">
-</topicref>
-</topicref>
-</topicref>
-<topicref href="../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.dita"
-navtitle="Exploring WSDL using the Web Services Explorer" scope="peer"></topicref>
-</map>
-<?Pub *0000001713?>
diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml
deleted file mode 100644
index d984e08..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wswsdleditort" label="wswsdleditort" topic="tasks/timpwsdl.html">
-<topic label="Importing a WSDL file" href="tasks/timpwsdl.html"/>
-<topic label="Creating a new WSDL file" href="tasks/tcrtwsdl.html"/>
-<topic label="Editing WSDL files with the WSDL Editor" href="concepts/cwsdled.html">
-<topic label="Editing WSDL files" href="tasks/tedtwsdl.html">
-<topic label="Adding a service" href="tasks/taddsrvc.html"/>
-<topic label="Adding a port to a service" href="tasks/taddport.html"/>
-<topic label="Setting a port type" href="tasks/tsetprtt.html"/>
-<topic label="Setting a binding" href="tasks/tsetbind.html"/>
-<topic label="Adding an operation" href="tasks/taddoper.html"/>
-<topic label="Adding a message" href="tasks/taddmess.html"/>
-<topic label="Adding a part to a message" href="tasks/taddpart.html"/>
-<topic label="Creating an import statement" href="tasks/tcrtimpt.html"/>
-<topic label="Creating a new type for your WSDL file" href="tasks/tcrttype.html"/>
-</topic>
-</topic>
-<topic label="Exploring WSDL using the Web Services Explorer" href="../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/.cvsignore b/docs/org.eclipse.wst.wsi.ui.doc.user/.cvsignore
deleted file mode 100644
index 385a69c..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.wst.wsi.ui.doc.user_1.0.0.jar
-bak
-temp
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/.project b/docs/org.eclipse.wst.wsi.ui.doc.user/.project
deleted file mode 100644
index 0d7c46e..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.wsi.ui.doc.user</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.wsi.ui.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1737c9a..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 07 23:09:10 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/DocBuild.xml b/docs/org.eclipse.wst.wsi.ui.doc.user/DocBuild.xml
deleted file mode 100644
index 9768002..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
- This script build the Help plug-in by transforming the DITA source files into HTML.
-
- To use this script, you must install DITA-OT on your machine in the directory
- defined by the dita.ot.dir property.
-
- Run the default target after you edit the DITA source files to regenerate the HTML.
-
- To customize this script for other Help plug-ins, modify the value of the args.input property
- to be the DITA map file for the plug-in.
-
- NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
- output directory structure will be shifted incorrectly.
-
- NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
- will be copied over the generated plugin.xml which is currently not being generated correctly
- by DITA-OT.
-
- ChangeLog:
- 2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
- - Created.
- 2008-05-05 Kate Price <katep@ca.ibm.com>
- - modified to add generation of pre-built help index.
- - Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
- <property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
- <path id="dost.class.path">
- <pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
- </path>
-
- <taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
- <classpath refid="dost.class.path" />
- </taskdef>
- <target name="all" depends="integrate, eclipsehelp">
- </target>
- <target name="integrate">
- <integrate ditadir="${dita.ot.dir}" />
- </target>
-
- <!-- revise below here -->
- <target name="eclipsehelp">
- <ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
- <property name="args.copycss" value="no" />
- <property name="args.csspath" value="../org.eclipse.wst.doc.user" />
- <property name="args.eclipse.provider" value="Eclipse.org" />
- <property name="args.eclipse.version" value="1.5.0" />
- <property name="args.input" location="wswsitest_toc.ditamap" />
- <property name="clean.temp" value="true" />
- <property name="dita.extname" value=".dita" />
- <property name="dita.temp.dir" location="temp" />
- <property name="output.dir" location="" />
- <property name="transtype" value="eclipsehelp" />
- </ant>
- <copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
- </target>
- <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-</project>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index c03b75a..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.wsi.ui.doc.user; singleton:=true
-Bundle-Version: 1.0.301.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/about.html b/docs/org.eclipse.wst.wsi.ui.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/build.properties b/docs/org.eclipse.wst.wsi.ui.doc.user/build.properties
deleted file mode 100644
index b2eb17c..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = about.html,\
- images/,\
- plugin.xml,\
- tasks/*.htm*,\
- wswsitest_toc.xml,\
- org.eclipse.wst.wsi.ui.doc.userindex.xml,\
- META-INF/,\
- index/,\
- plugin.properties
-src.includes = build.properties,\
- *.maplist,\
- *.ditamap,\
- tasks/*.dita
-bin.excludes = DocBuild.xml,\
- myPlugin*.xml
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/images/traffic.gif b/docs/org.eclipse.wst.wsi.ui.doc.user/images/traffic.gif
deleted file mode 100644
index 231ea4a..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/images/traffic.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/images/wsivalico.gif b/docs/org.eclipse.wst.wsi.ui.doc.user/images/wsivalico.gif
deleted file mode 100644
index 1bcad84..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/images/wsivalico.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/index/_3.cfs b/docs/org.eclipse.wst.wsi.ui.doc.user/index/_3.cfs
deleted file mode 100644
index 0b097d3..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/index/_3.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/index/deletable b/docs/org.eclipse.wst.wsi.ui.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_contributions
deleted file mode 100644
index 3703233..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 17:34:23 EDT 2008
-org.eclipse.wst.wsi.ui.doc.user=org.eclipse.wst.wsi.ui.doc.user\n1.0.203.qualifier
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_dependencies
deleted file mode 100644
index c9fa09d..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 17:34:23 EDT 2008
-lucene=1.9.1.v200803061811
-analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_docs b/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_docs
deleted file mode 100644
index bc08ddf..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,5 +0,0 @@
-#This is a generated file; do not edit.
-#Wed May 14 17:34:23 EDT 2008
-/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html=0
-/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html=0
-/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html=0
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/index/segments b/docs/org.eclipse.wst.wsi.ui.doc.user/index/segments
deleted file mode 100644
index d8b5796..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/myplugin.xml b/docs/org.eclipse.wst.wsi.ui.doc.user/myplugin.xml
deleted file mode 100644
index a796acf..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/myplugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
- <toc file="wswsitest_toc.xml"/>
- <index path="index/"/>
-</extension>
-
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.wst.wsi.ui.doc.userindex.xml"/>
-</extension>
-<extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.user.maplist b/docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.user.maplist
deleted file mode 100644
index 3d58a26..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.user.maplist
+++ /dev/null
@@ -1,8 +0,0 @@
-<maplist version="3.6.2">
- <nav>
- <map file="wswsitest_toc.ditamap"/>
- </nav>
- <link>
- <map file="wswsitest_toc.ditamap"/>
- </link>
-</maplist>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.userindex.xml b/docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.userindex.xml
deleted file mode 100644
index 9c2d4b3..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.userindex.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
- <entry keyword="WSDL files">
- <entry keyword="validating">
- <topic href="tasks/twsdlval.html#twsdlval" title="Validating WSDL files"/>
- </entry>
- </entry>
- <entry keyword="Web services">
- <entry keyword="validating WSDL">
- <topic href="tasks/twsdlval.html#twsdlval" title="Validating WSDL files"/>
- </entry>
- <entry keyword="testing traffic">
- <topic href="tasks/tmonitor.html#tmonitor" title="Using the TCP/IP Monitor to test Web services"/>
- </entry>
- <entry keyword="monitoring TCP/IP traffic">
- <topic href="tasks/tmonitor.html#tmonitor" title="Using the TCP/IP Monitor to test Web services"/>
- </entry>
- <entry keyword="interoperability">
- <entry keyword="validating">
- <topic href="tasks/twsival.html#twsival" title="Validating WS-I Web service traffic compliance"/>
- </entry>
- </entry>
- <entry keyword="validating WS-I compliance">
- <entry keyword="validating">
- <topic href="tasks/twsival.html#twsival" title="Validating WS-I Web service traffic compliance"/>
- </entry>
- <entry keyword="interoperability">
- <topic href="tasks/twsival.html#twsival" title="Validating WS-I Web service traffic compliance"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="TCP/IP Monitor">
- <entry keyword="testing Web services">
- <topic href="tasks/tmonitor.html#tmonitor" title="Using the TCP/IP Monitor to test Web services"/>
- </entry>
- </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.properties b/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.properties
deleted file mode 100644
index d936fec..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-pluginName = WS-I Validation Documentation
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.xml b/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.xml
deleted file mode 100644
index a796acf..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
- <toc file="wswsitest_toc.xml"/>
- <index path="index/"/>
-</extension>
-
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.wst.wsi.ui.doc.userindex.xml"/>
-</extension>
-<extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.dita b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.dita
deleted file mode 100644
index 7d6f6e9..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.dita
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tmonitor" xml:lang="en-us">
-<title>Using the TCP/IP Monitor to test Web services</title>
-<titlealts>
-<searchtitle>Using the TCP/IP or SOAP monitor to test Web services</searchtitle>
-</titlealts>
-<shortdesc>Once you have created your Web service and Web service client,
-you can monitor the Web service's SOAP traffic using the TCP/IP Monitor.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm keyref="tmonitor|1|TCP/IPMonitortestingWebservices" status="unchanged">TCP/IP
-Monitor<indexterm>testing Web services</indexterm></indexterm><indexterm keyref="tmonitor|2|Webservicestestingtraffic"
-status="unchanged">Web services<indexterm>testing traffic</indexterm></indexterm>
-<indexterm keyref="tmonitor|3|WebservicesmonitoringTCP/IPtraffic" status="unchanged">Web
-services<indexterm>monitoring TCP/IP traffic</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<prereq><p> Prerequisites: </p><ul>
-<li>Generate a Web service</li>
-<li>Generate a Proxy and a sample application</li>
-</ul></prereq>
-<context><p>When creating a Web service using the Web service or Web service
-client wizards, you can select to set up and run the TCP/IP Monitor automatically.
-Alternately, you can set up the TCP/IP Monitor manually by completing the
-following steps:</p></context>
-<steps>
-<step><cmd>In the sample application, invoke the getEndPoint method. Record
-this endpoint. The default endpoint for a Web service is: http://localhost:<port>/<web
-module context root>/services/<port></cmd></step>
-<step><cmd>Create a server to act as the TCP/IP Monitor:</cmd>
-<substeps>
-<substep><cmd>From the Window menu, select <uicontrol>Preferences</uicontrol>. </cmd>
-</substep>
-<substep><cmd>In the Preferences window, expand <uicontrol>Run/Debug</uicontrol>,
-and then select <uicontrol>TCP/IP Monitor</uicontrol>. </cmd></substep>
-<substep><cmd>Select the <uicontrol>Show TCP/IP Monitor View when there is
-activity</uicontrol> check box. </cmd></substep>
-<substep><cmd>Under the TCP/IP Monitors lists, click <uicontrol>Add</uicontrol>.
-A New Monitor dialog opens.</cmd></substep>
-<substep><cmd>Specify the following settings: </cmd></substep>
-</substeps>
-<choicetable>
-<chhead><choptionhd>Option</choptionhd><chdeschd>Description</chdeschd></chhead>
-<chrow><choption>Local monitoring port</choption><chdesc>Specify a unique
-port number on your local machine.</chdesc></chrow>
-<chrow><choption>Host name</choption><chdesc>Specify the host name or IP address
-of the machine where the server is running.</chdesc></chrow>
-<chrow><choption>Port</choption><chdesc>Specify the port number of the remote
-server.</chdesc></chrow>
-<chrow><choption>Type</choption><chdesc>Specify whether the request type from
-the Web browser are sent by HTTP or TCP/IP. If the HTTP option is selected
-the requests from the Web browser are modified so that the HTTP header points
-to the remote machine and separated if multiple HTTP requests are received
-in the same connection. If the TCP/IP option is selected, all the requests
-are sent byte for byte. </chdesc></chrow>
-<chrow><choption>Timeout</choption><chdesc>Specify how long you would like
-the monitor to wait before attempting to connect again.</chdesc></chrow>
-</choicetable>
-</step>
-<step><cmd>In order to route the Web service through the monitor, the endpoint
-of the Web service client must be changed. The TCP/IP Monitor listens on port
-9081. In the Web browser window used in step 1, invoke the setEndPoint method,
-and change the endpoint so that it directs to port 9081. For example, the
-default would be: <codeph>http://localhost:9081/web_module_context_root/servlet/rpcrouter</codeph> Invoke
-the getEndPoint method again to ensure that your change has been implemented.</cmd>
-</step>
-<step><cmd>Select a Web service method in the Methods pane. Invoke this method.</cmd>
-</step>
-<step><cmd>Change to the TCP/IP Monitor view by selecting the TCP/IP Monitor
-tab in the Servers view. This will display request and response pairs that
-are being routed through the TCP/IP Monitor. It will look similar to the following
-picture: <image alt="Screen capture of request and response traffic" href="../images/traffic.gif"
-placement="break"></image></cmd></step>
-<step><cmd>To ensure that your Web service SOAP traffic is WS-I compliant,
-you can generate a log file by clicking the <image alt="WS-I validation icon"
-href="../images/wsivalico.gif"></image> icon. In the dialog box that opens,
-select a name for the log file and specify where you want it to be stored. </cmd>
-</step>
-</steps>
-<result>This log file will be validated for WS-I compliance. You can open
-the log file in an XML editor to examine its contents.</result>
-</taskbody>
-<related-links>
-<linklist><title>Related Concepts</title>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/csoap.dita" scope="peer">
-<linktext>SOAP</linktext></link>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.dita" scope="peer">
-<linktext>WS-I</linktext></link>
-</linklist>
-<linklist><title>Related Tasks</title>
-<link href="../../org.eclipse.jst.ws.doc.user/ref/rservpolpref.dita" scope="peer">
-<linktext>Setting the level of WS-I compliance</linktext></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html
deleted file mode 100644
index 1aa0354..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Using the TCP/IP Monitor to test Web services" />
-<meta name="abstract" content="Once you have created your Web service and Web service client, you can monitor the Web service's SOAP traffic using the TCP/IP Monitor." />
-<meta name="description" content="Once you have created your Web service and Web service client, you can monitor the Web service's SOAP traffic using the TCP/IP Monitor." />
-<meta content="TCP/IP Monitor, testing Web services, Web services, testing traffic, Web services, monitoring TCP/IP traffic" name="DC.subject" />
-<meta content="TCP/IP Monitor, testing Web services, Web services, testing traffic, Web services, monitoring TCP/IP traffic" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/concepts/csoap.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/tasks/twsicomply.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tmonitor" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Using the TCP/IP or SOAP monitor to test Web services</title>
-</head>
-<body id="tmonitor"><a name="tmonitor"><!-- --></a>
-
-
-<h1 class="topictitle1">Using the TCP/IP Monitor to test Web services</h1>
-
-
-
-
-<div><p>Once you have created your Web service and Web service client,
-you can monitor the Web service's SOAP traffic using the TCP/IP Monitor.</p>
-
-<div class="p"><p> Prerequisites: </p>
-<ul>
-<li>Generate a Web service</li>
-
-<li>Generate a Proxy and a sample application</li>
-
-</ul>
-</div>
-
-<div class="section"><p>When creating a Web service using the Web service or Web service
-client wizards, you can select to set up and run the TCP/IP Monitor automatically.
-Alternately, you can set up the TCP/IP Monitor manually by completing the
-following steps:</p>
-</div>
-
-<ol>
-<li><span>In the sample application, invoke the getEndPoint method. Record
-this endpoint. The default endpoint for a Web service is: http://localhost:<port>/<web
-module context root>/services/<port></span></li>
-
-<li><span>Create a server to act as the TCP/IP Monitor:</span>
-<ol type="a">
-<li><span>From the Window menu, select <span class="uicontrol">Preferences</span>. </span>
-</li>
-
-<li><span>In the Preferences window, expand <span class="uicontrol">Run/Debug</span>,
-and then select <span class="uicontrol">TCP/IP Monitor</span>. </span></li>
-
-<li><span>Select the <span class="uicontrol">Show TCP/IP Monitor View when there is
-activity</span> check box. </span></li>
-
-<li><span>Under the TCP/IP Monitors lists, click <span class="uicontrol">Add</span>.
-A New Monitor dialog opens.</span></li>
-
-<li><span>Specify the following settings: </span></li>
-
-</ol>
-
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N100F4-option">Option</th>
-<th valign="bottom" id="N100F4-desc">Description</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N100F4-option" id="N1010D"><strong>Local monitoring port</strong></td>
-<td valign="top" headers="N100F4-desc N1010D">Specify a unique
-port number on your local machine.</td>
-</tr>
-
-<tr><td valign="top" headers="N100F4-option" id="N1011C"><strong>Host name</strong></td>
-<td valign="top" headers="N100F4-desc N1011C">Specify the host name or IP address
-of the machine where the server is running.</td>
-</tr>
-
-<tr><td valign="top" headers="N100F4-option" id="N1012B"><strong>Port</strong></td>
-<td valign="top" headers="N100F4-desc N1012B">Specify the port number of the remote
-server.</td>
-</tr>
-
-<tr><td valign="top" headers="N100F4-option" id="N1013A"><strong>Type</strong></td>
-<td valign="top" headers="N100F4-desc N1013A">Specify whether the request type from
-the Web browser are sent by HTTP or TCP/IP. If the HTTP option is selected
-the requests from the Web browser are modified so that the HTTP header points
-to the remote machine and separated if multiple HTTP requests are received
-in the same connection. If the TCP/IP option is selected, all the requests
-are sent byte for byte. </td>
-</tr>
-
-<tr><td valign="top" headers="N100F4-option" id="N10149"><strong>Timeout</strong></td>
-<td valign="top" headers="N100F4-desc N10149">Specify how long you would like
-the monitor to wait before attempting to connect again.</td>
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li><span>In order to route the Web service through the monitor, the endpoint
-of the Web service client must be changed. The TCP/IP Monitor listens on port
-9081. In the Web browser window used in step 1, invoke the setEndPoint method,
-and change the endpoint so that it directs to port 9081. For example, the
-default would be: <samp class="codeph">http://localhost:9081/web_module_context_root/servlet/rpcrouter</samp> Invoke
-the getEndPoint method again to ensure that your change has been implemented.</span>
-</li>
-
-<li><span>Select a Web service method in the Methods pane. Invoke this method.</span>
-</li>
-
-<li><span>Change to the TCP/IP Monitor view by selecting the TCP/IP Monitor
-tab in the Servers view. This will display request and response pairs that
-are being routed through the TCP/IP Monitor. It will look similar to the following
-picture: <br /><img src="../images/traffic.gif" alt="Screen capture of request and response traffic" /><br /></span></li>
-
-<li><span>To ensure that your Web service SOAP traffic is WS-I compliant,
-you can generate a log file by clicking the <img src="../images/wsivalico.gif" alt="WS-I validation icon" /> icon. In the dialog box that opens,
-select a name for the log file and specify where you want it to be stored. </span>
-</li>
-
-</ol>
-
-<div class="section">This log file will be validated for WS-I compliance. You can open
-the log file in an XML editor to examine its contents.</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/csoap.html">SOAP</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html">WS-I</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/ref/rservpolpref.dita">Setting the level of WS-I compliance</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.dita b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.dita
deleted file mode 100644
index f222b30..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="twsdlval" xml:lang="en-us">
-<title>Validating WSDL files</title>
-<titlealts>
-<searchtitle>Validating WSDL files</searchtitle>
-</titlealts>
-<shortdesc>If you have created a WSDL file through the Web services wizard
-the WSDL that is generated should be valid. However, if you have imported
-a WSDL file, or if you are creating a WSDL file, you should validate the WSDL
-to ensure it is valid.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm keyref="twsdlval|1|WSDLvalidating" status="unchanged">WSDL
-files<indexterm>validating</indexterm></indexterm><indexterm keyref="twsdlval|2|WebservicesvalidatingWSDL"
-status="unchanged">Web services<indexterm>validating WSDL</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>If you have selected Require or Suggest WS-I Compliance on the
-WS-I Compliance preference page, the validation also checks WS-I compliance.
-If you have selected Ignore WS-I Compliance the validator will only check
-the validity of the WSDL. For more information on setting WS-I compliance
-levels, refer to: <xref href="../../org.eclipse.jst.ws.doc.user/ref/rservpolpref.dita"
-scope="peer"> Setting the level of WS-I compliance</xref>.</p><p>The WSDL
-Validator compares the WSDL file in your project to the W3C <xref format="html"
-href="http://www.w3.org/TR/wsdl" scope="external">Web Services Description
-Language (WSDL) 1.1</xref> specifications, and the WS-I compliance settings
-that you have selected.</p><p>To validate your WSDL, complete the following
-steps:</p></context>
-<steps>
-<step><cmd>Select a WSDL file in the <b>Project Navigator</b> view.</cmd>
-</step>
-<step><cmd>Right-click the WSDL file, and select <b>Validate</b></cmd></step>
-</steps>
-<result>Any problems encountered while validating the file will be shown in
-the <b>Tasks</b> view.<p>When you rebuild a project or save a resource, the
-WSDL Validator can be set to run automatically. To do this, from the Window
-menu, select <b>Preferences</b> > <b>Validation</b>. Ensure that the WSDL
-Validator check box in the Build column is selected.</p></result>
-</taskbody>
-<related-links>
-<linklist><title>Related Concepts</title>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.dita" scope="peer">
-<linktext>WSDL</linktext></link>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.dita" scope="peer">
-<linktext>WS-I</linktext></link>
-</linklist>
-<linklist><title>Related Tasks</title>
-<link href="../../org.eclipse.jst.ws.doc.user/ref/rservpolpref.dita" scope="peer">
-<linktext>Setting WS-I compliance</linktext></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html
deleted file mode 100644
index b9b35d4..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating WSDL files" />
-<meta name="abstract" content="If you have created a WSDL file through the Web services wizard the WSDL that is generated should be valid. However, if you have imported a WSDL file, or if you are creating a WSDL file, you should validate the WSDL to ensure it is valid." />
-<meta name="description" content="If you have created a WSDL file through the Web services wizard the WSDL that is generated should be valid. However, if you have imported a WSDL file, or if you are creating a WSDL file, you should validate the WSDL to ensure it is valid." />
-<meta content="WSDL files, validating, Web services, validating WSDL" name="DC.subject" />
-<meta content="WSDL files, validating, Web services, validating WSDL" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/tasks/twsicomply.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twsdlval" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating WSDL files</title>
-</head>
-<body id="twsdlval"><a name="twsdlval"><!-- --></a>
-
-
-<h1 class="topictitle1">Validating WSDL files</h1>
-
-
-
-
-<div><p>If you have created a WSDL file through the Web services wizard
-the WSDL that is generated should be valid. However, if you have imported
-a WSDL file, or if you are creating a WSDL file, you should validate the WSDL
-to ensure it is valid.</p>
-
-<div class="section"><p>If you have selected Require or Suggest WS-I Compliance on the
-WS-I Compliance preference page, the validation also checks WS-I compliance.
-If you have selected Ignore WS-I Compliance the validator will only check
-the validity of the WSDL. For more information on setting WS-I compliance
-levels, refer to: <a href="../../org.eclipse.jst.ws.doc.user/tasks/twsicomply.html">Setting the level of WS-I compliance</a>.</p>
-<p>The WSDL
-Validator compares the WSDL file in your project to the W3C <a href="http://www.w3.org/TR/wsdl" target="_blank">Web Services Description Language (WSDL) 1.1</a> specifications, and the WS-I compliance settings
-that you have selected.</p>
-<p>To validate your WSDL, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li><span>Select a WSDL file in the <strong>Project Navigator</strong> view.</span>
-</li>
-
-<li><span>Right-click the WSDL file, and select <strong>Validate</strong></span></li>
-
-</ol>
-
-<div class="section">Any problems encountered while validating the file will be shown in
-the <strong>Tasks</strong> view.<p>When you rebuild a project or save a resource, the
-WSDL Validator can be set to run automatically. To do this, from the Window
-menu, select <strong>Preferences</strong> > <strong>Validation</strong>. Ensure that the WSDL
-Validator check box in the Build column is selected.</p>
-</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html">WS-I</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/ref/rservpolpref.dita">Setting WS-I compliance</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.dita b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.dita
deleted file mode 100644
index 486c8a2..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="twsival" xml:lang="en-us">
-<title>Validating WS-I Web service traffic compliance</title>
-<titlealts>
-<searchtitle>Validating WS-I Web service traffic compliance</searchtitle>
-</titlealts>
-<shortdesc>As well as setting the level of WS-I compliance during Web services
-creation, you can validate WS-I compliance of the SOAP traffic a Web service
-produces through the TCP/IP Monitor.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm keyref="twsival|1|WS-Ivalidating" status="unchanged">Web
-services<indexterm>interoperability<indexterm>validating</indexterm></indexterm></indexterm>
-<indexterm keyref="twsival|2|WebservicesvalidatingWS-Icomplianceinteroperabilityvalidating"
-status="unchanged">Web services<indexterm>validating WS-I compliance<indexterm>interoperability<indexterm>validating</indexterm></indexterm></indexterm
-></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<prereq> Prerequisites: Before you can use the validation tool to ensure that
-your Web service SOAP traffic is WS-I compliant, you must have completed the
-following steps:<ul>
-<li>Generate a Web service.</li>
-<li> <xref href="twsdlval.dita">Validate the WSDL that is produced.</xref> </li>
-<li>Generate a Proxy and a sample application. </li>
-<li> <xref href="tmonitor.dita">Set up the TCP/IP Monitor.</xref> Ensure that
-your Web service sample application traffic is directed through the TCP/IP
-Monitor.</li>
-</ul></prereq>
-<context><p>To validate your Web service, complete the following steps:</p></context>
-<steps>
-<step><cmd>Invoke a method in your Web service sample application to generate
-traffic through the TCP/IP Monitor.</cmd></step>
-<step><cmd>To ensure that your Web service SOAP traffic is WS-I compliant,
-you can generate a log file by clicking the <image alt="Validate icon" href="../images/wsivalico.gif">
-</image> icon.</cmd></step>
-<step><cmd>In the dialog box that opens, select a name for the log file and
-specify where you want it to be stored.</cmd></step>
-</steps>
-<result> This log file will show whether or not messages sent to and from
-your Web service are WS-I compliant, and list any non-compliant elements.
-You can open the log file in an XML editor to examine its contents.</result>
-</taskbody>
-<related-links>
-<linklist><title>Related Concepts</title>
-<link href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.dita" scope="peer">
-<linktext>WS-I</linktext></link>
-</linklist>
-<linklist><title>Related Tasks</title>
-<link href="../../org.eclipse.jst.ws.doc.user/ref/rservpolpref.dita" scope="peer">
-<linktext>Setting the level of WS-I compliance</linktext></link>
-</linklist>
-</related-links>
-</task>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html
deleted file mode 100644
index 132a0c8..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating WS-I Web service traffic compliance" />
-<meta name="abstract" content="As well as setting the level of WS-I compliance during Web services creation, you can validate WS-I compliance of the SOAP traffic a Web service produces through the TCP/IP Monitor." />
-<meta name="description" content="As well as setting the level of WS-I compliance during Web services creation, you can validate WS-I compliance of the SOAP traffic a Web service produces through the TCP/IP Monitor." />
-<meta content="Web services, interoperability, validating, Web services, validating WS-I compliance" name="DC.subject" />
-<meta content="Web services, interoperability, validating, Web services, validating WS-I compliance" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ws.doc.user/tasks/twsicomply.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twsival" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating WS-I Web service traffic compliance</title>
-</head>
-<body id="twsival"><a name="twsival"><!-- --></a>
-
-
-<h1 class="topictitle1">Validating WS-I Web service traffic compliance</h1>
-
-
-
-
-<div><p>As well as setting the level of WS-I compliance during Web services
-creation, you can validate WS-I compliance of the SOAP traffic a Web service
-produces through the TCP/IP Monitor.</p>
-
-<div class="p"> Prerequisites: Before you can use the validation tool to ensure that
-your Web service SOAP traffic is WS-I compliant, you must have completed the
-following steps:<ul>
-<li>Generate a Web service.</li>
-
-<li> <a href="twsdlval.html">Validate the WSDL that is produced.</a> </li>
-
-<li>Generate a Proxy and a sample application. </li>
-
-<li> <a href="tmonitor.html">Set up the TCP/IP Monitor.</a> Ensure that
-your Web service sample application traffic is directed through the TCP/IP
-Monitor.</li>
-
-</ul>
-</div>
-
-<div class="section"><p>To validate your Web service, complete the following steps:</p>
-</div>
-
-<ol>
-<li><span>Invoke a method in your Web service sample application to generate
-traffic through the TCP/IP Monitor.</span></li>
-
-<li><span>To ensure that your Web service SOAP traffic is WS-I compliant,
-you can generate a log file by clicking the <img src="../images/wsivalico.gif" alt="Validate icon" /> icon.</span></li>
-
-<li><span>In the dialog box that opens, select a name for the log file and
-specify where you want it to be stored.</span></li>
-
-</ol>
-
-<div class="section"> This log file will show whether or not messages sent to and from
-your Web service are WS-I compliant, and list any non-compliant elements.
-You can open the log file in an XML editor to examine its contents.</div>
-
-</div>
-
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html">WS-I</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/ref/rservpolpref.dita">Setting the level of WS-I compliance</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.ditamap b/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.ditamap
deleted file mode 100644
index fd982c9..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.ditamap
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">
-<map anchorref="../org.eclipse.jst.ws.doc.user/webservice_toc.ditamap#wswsitest"
-id="wswsitest" title="wswsitest">
-<topicref href="tasks/twsdlval.dita" navtitle="Validating WSDL"></topicref>
-<topicref href="tasks/tmonitor.dita" navtitle="Testing Web services with the TCP/IP Monitor">
-</topicref>
-<topicref href="tasks/twsival.dita" navtitle="Validating WS-I compliance of Web service SOAP traffic">
-</topicref>
-</map>
diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml b/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml
deleted file mode 100644
index a1020ae..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wswsitest" label="wswsitest" topic="tasks/twsdlval.html">
-<topic label="Validating WSDL files" href="tasks/twsdlval.html"/>
-<topic label="Using the TCP/IP Monitor to test Web services" href="tasks/tmonitor.html"/>
-<topic label="Validating WS-I Web service traffic compliance" href="tasks/twsival.html"/>
-</toc>
diff --git a/features/org.eclipse.wst.ws_core.feature/.cvsignore b/features/org.eclipse.wst.ws_core.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.ws_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.ws_core.feature/.project b/features/org.eclipse.wst.ws_core.feature/.project
deleted file mode 100644
index 5effa78..0000000
--- a/features/org.eclipse.wst.ws_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws_core.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.ws_core.feature/build.properties b/features/org.eclipse.wst.ws_core.feature/build.properties
deleted file mode 100644
index 364480b..0000000
--- a/features/org.eclipse.wst.ws_core.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-
diff --git a/features/org.eclipse.wst.ws_core.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.ws_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.ws_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_core.feature/epl-v10.html b/features/org.eclipse.wst.ws_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.ws_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.ws_core.feature/feature.properties b/features/org.eclipse.wst.ws_core.feature/feature.properties
deleted file mode 100644
index e79be30..0000000
--- a/features/org.eclipse.wst.ws_core.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Services Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST Web Services core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.ws_core.feature/feature.xml b/features/org.eclipse.wst.ws_core.feature/feature.xml
deleted file mode 100644
index 03d7bc2..0000000
--- a/features/org.eclipse.wst.ws_core.feature/feature.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.ws_core.feature"
- label="%featureName"
- version="3.0.4.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.wst.ws_wsdl14.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.ws_wsdl15.feature"
- version="0.0.0"/>
-
- <requires>
- <import feature="org.eclipse.platform" version="3.4.0"/>
- <import feature="org.eclipse.emf.ecore" version="2.4.0"/>
- <import feature="org.eclipse.emf.common" version="2.4.0"/>
- <import feature="org.eclipse.xsd" version="2.4.0"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.ws"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.ws.parser"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.wsdl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.wsdl.validation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.wsi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="1.0.4.qualifier"
- unpack="false"/>
-
- <plugin
- id="org.apache.log4j"
- download-size="0"
- install-size="0"
- version="1.2.13.qualifier"
- unpack="false"/>
-
- <plugin
- id="org.apache.wsil4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.uddi4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.discovery"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="javax.xml.rpc"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="javax.xml.soap"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.apache.axis"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="javax.mail"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.activation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.ws.service.policy"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.ws_core.feature/license.html b/features/org.eclipse.wst.ws_core.feature/license.html
deleted file mode 100644
index 76abfb4..0000000
--- a/features/org.eclipse.wst.ws_core.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.html b/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 290da85..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web Service Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 2139d0f..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - Web Service Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index d2a94d5..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST WS Core Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for WST WS core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 290da85..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web Service Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 2139d0f..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - Web Service Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_sdk.feature/.cvsignore b/features/org.eclipse.wst.ws_sdk.feature/.cvsignore
deleted file mode 100644
index f86671d..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-features
-plugins
-org.eclipse.wst.ws_sdk.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.ws_sdk.feature/.project b/features/org.eclipse.wst.ws_sdk.feature/.project
deleted file mode 100644
index 87ebee7..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.ws_sdk.feature/build.properties b/features/org.eclipse.wst.ws_sdk.feature/build.properties
deleted file mode 100644
index 106f80f..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- feature.properties
-
-generate.feature@org.eclipse.wst.ws_ui.feature.source=org.eclipse.wst.ws_ui.feature, feature@org.eclipse.wst.ws_core.feature.source
diff --git a/features/org.eclipse.wst.ws_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.ws_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_sdk.feature/epl-v10.html b/features/org.eclipse.wst.ws_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.ws_sdk.feature/feature.properties b/features/org.eclipse.wst.ws_sdk.feature/feature.properties
deleted file mode 100644
index f705c26..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Services Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for the WST Web services tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.ws_sdk.feature/feature.xml b/features/org.eclipse.wst.ws_sdk.feature/feature.xml
deleted file mode 100644
index 9acc3b9..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/feature.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.ws_sdk.feature"
- label="%featureName"
- version="3.0.4.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.wst.ws_ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.ws_ui.feature.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.ws.api.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.wsdl.doc.isv"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.ws_sdk.feature/license.html b/features/org.eclipse.wst.ws_sdk.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.ws_tests.feature/.cvsignore b/features/org.eclipse.wst.ws_tests.feature/.cvsignore
deleted file mode 100644
index 02d56e4..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.ws_tests.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.ws_tests.feature/.project b/features/org.eclipse.wst.ws_tests.feature/.project
deleted file mode 100644
index cae2354..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.ws_tests.feature/build.properties b/features/org.eclipse.wst.ws_tests.feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- feature.properties
diff --git a/features/org.eclipse.wst.ws_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.ws_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_tests.feature/epl-v10.html b/features/org.eclipse.wst.ws_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.ws_tests.feature/feature.properties b/features/org.eclipse.wst.ws_tests.feature/feature.properties
deleted file mode 100644
index 618e68a..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Services Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST Web services tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.ws_tests.feature/feature.xml b/features/org.eclipse.wst.ws_tests.feature/feature.xml
deleted file mode 100644
index 7c28ac2..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/feature.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.ws_tests.feature"
- label="%featureName"
- version="3.0.101.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.wst.ws.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.wsdl.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.wsdl.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.wsdl.tests.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.wsdl.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.wsi.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.wsdl.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.ws_tests.feature/license.html b/features/org.eclipse.wst.ws_tests.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.ws_ui.feature/.cvsignore b/features/org.eclipse.wst.ws_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.ws_ui.feature/.project b/features/org.eclipse.wst.ws_ui.feature/.project
deleted file mode 100644
index c03a8b0..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws_ui.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.ws_ui.feature/build.properties b/features/org.eclipse.wst.ws_ui.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.ws_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.ws_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_ui.feature/epl-v10.html b/features/org.eclipse.wst.ws_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.ws_ui.feature/feature.properties b/features/org.eclipse.wst.ws_ui.feature/feature.properties
deleted file mode 100644
index 39600e0..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Services UI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Web Services UI tools.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.ws_ui.feature/feature.xml b/features/org.eclipse.wst.ws_ui.feature/feature.xml
deleted file mode 100644
index 97058a4..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/feature.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.ws_ui.feature"
- label="%featureName"
- version="3.0.4.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.wst.ws_userdoc.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.ws_core.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.xml_ui.feature"
- version="0.0.0"/>
-
- <requires>
- <import feature="org.eclipse.platform" version="3.4.0.v20080528-9I96EhtEm-T_5C48s6QSenwkJ3cHInkRH3nTT"/>
- <import feature="org.eclipse.gef" version="3.4.0.v20080115-677-8082A5696H2748"/>
- <import feature="org.eclipse.emf.edit" version="2.4.0.v200806021643"/>
- <import feature="org.eclipse.emf.edit.ui" version="2.4.0.v200806021643"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.ws.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.ws.explorer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.ws.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.wsdl.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.wsi.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.ws.service.policy.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.ws_ui.feature/license.html b/features/org.eclipse.wst.ws_ui.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.html b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 339787a..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web Service UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 63a6545..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - Web Service UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index ccc2292..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.wst.ws_core.feature.source = org.eclipse.wst.ws_core.feature
-
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index b153223..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST WS UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for WST WS UI.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 339787a..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web Service UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 63a6545..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - Web Service UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/.cvsignore b/features/org.eclipse.wst.ws_userdoc.feature/.cvsignore
deleted file mode 100644
index ceeff56..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.ws_userdoc.feature_1.0.0.jar
-org.eclipse.wst.xml_userdoc.feature_1.0.0.jar
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/.project b/features/org.eclipse.wst.ws_userdoc.feature/.project
deleted file mode 100644
index fd5675e..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws_userdoc.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/build.properties b/features/org.eclipse.wst.ws_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.ws_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/epl-v10.html b/features/org.eclipse.wst.ws_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/feature.properties b/features/org.eclipse.wst.ws_userdoc.feature/feature.properties
deleted file mode 100644
index bca585c..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Services User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST Web services user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/feature.xml b/features/org.eclipse.wst.ws_userdoc.feature/feature.xml
deleted file mode 100644
index f49911c..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.ws_userdoc.feature"
- label="%featureName"
- version="3.0.1.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.wst.wsdl.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.wsi.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.command.env.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/license.html b/features/org.eclipse.wst.ws_userdoc.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.ws_wsdl15.feature/.project b/features/org.eclipse.wst.ws_wsdl15.feature/.project
deleted file mode 100644
index 4b050c8..0000000
--- a/features/org.eclipse.wst.ws_wsdl15.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws_wsdl15.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.ws_wsdl15.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.wst.ws_wsdl15.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index fe386f7..0000000
--- a/features/org.eclipse.wst.ws_wsdl15.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Dec 17 17:36:59 EST 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/features/org.eclipse.wst.ws_wsdl15.feature/build.properties b/features/org.eclipse.wst.ws_wsdl15.feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/features/org.eclipse.wst.ws_wsdl15.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
diff --git a/features/org.eclipse.wst.ws_wsdl15.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.ws_wsdl15.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.ws_wsdl15.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.ws_wsdl15.feature/epl-v10.html b/features/org.eclipse.wst.ws_wsdl15.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.ws_wsdl15.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.ws_wsdl15.feature/feature.properties b/features/org.eclipse.wst.ws_wsdl15.feature/feature.properties
deleted file mode 100644
index 69ac2eb..0000000
--- a/features/org.eclipse.wst.ws_wsdl15.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WSDL 1.5 Feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WSDL 1.5 Feature
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June, 2008\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.ws_wsdl15.feature/feature.xml b/features/org.eclipse.wst.ws_wsdl15.feature/feature.xml
deleted file mode 100644
index 9494ae9..0000000
--- a/features/org.eclipse.wst.ws_wsdl15.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.ws_wsdl15.feature"
- label="%featureName"
- version="1.5.2.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="javax.wsdl"
- download-size="0"
- install-size="0"
- version="1.5.1.qualifier"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.ws_wsdl15.feature/license.html b/features/org.eclipse.wst.ws_wsdl15.feature/license.html
deleted file mode 100644
index 76abfb4..0000000
--- a/features/org.eclipse.wst.ws_wsdl15.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.classpath b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.classpath
deleted file mode 100644
index f2898cc..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.cvsignore b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.cvsignore
deleted file mode 100644
index 57763eb..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.project b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.project
deleted file mode 100644
index 202e7cf..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 47db108..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-#Thu May 31 14:28:33 EDT 2007
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5770402..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:39 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index ae07334..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core.tests
-Bundle-Version: 1.0.102.qualifier
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.junit,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.wst.ws,
- org.eclipse.jst.ws,
- org.eclipse.wst.common.uriresolver
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ClassPath: test.jar
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/about.html b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/build.properties b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/build.properties
deleted file mode 100644
index d2eac30..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = META-INF/,\
- about.html,\
- data/,\
- plugin.properties,\
- test.jar
-jars.compile.order = test.jar
-output.test.jar = bin/
-source.test.jar = tests/
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceProxy.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceProxy.java
deleted file mode 100644
index 527a48f..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceProxy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.tempuri.AreaService;
-
-public class AreaServiceProxy implements org.tempuri.AreaService.AreaService_PortType {
- private String _endpoint = null;
- private org.tempuri.AreaService.AreaService_PortType areaService_PortType = null;
-
- public AreaServiceProxy() {
- _initAreaServiceProxy();
- }
-
- private void _initAreaServiceProxy() {
- try {
- areaService_PortType = (new org.tempuri.AreaService.AreaService_ServiceLocator()).getAreaServiceSOAP();
- if (areaService_PortType != null) {
- if (_endpoint != null)
- ((javax.xml.rpc.Stub)areaService_PortType)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
- else
- _endpoint = (String)((javax.xml.rpc.Stub)areaService_PortType)._getProperty("javax.xml.rpc.service.endpoint.address");
- }
-
- }
- catch (javax.xml.rpc.ServiceException serviceException) {}
- }
-
- public String getEndpoint() {
- return _endpoint;
- }
-
- public void setEndpoint(String endpoint) {
- _endpoint = endpoint;
- if (areaService_PortType != null)
- ((javax.xml.rpc.Stub)areaService_PortType)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
-
- }
-
- public org.tempuri.AreaService.AreaService_PortType getAreaService_PortType() {
- if (areaService_PortType == null)
- _initAreaServiceProxy();
- return areaService_PortType;
- }
-
- public float calculateRectArea(org.tempuri.AreaService.Dimensions parameters) throws java.rmi.RemoteException{
- if (areaService_PortType == null)
- _initAreaServiceProxy();
- return areaService_PortType.calculateRectArea(parameters);
- }
-
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceSOAPStub.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceSOAPStub.java
deleted file mode 100644
index e1eb921..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceSOAPStub.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * AreaServiceSOAPStub.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package org.tempuri.AreaService;
-
-public class AreaServiceSOAPStub extends org.apache.axis.client.Stub implements org.tempuri.AreaService.AreaService_PortType {
- private java.util.Vector cachedSerClasses = new java.util.Vector();
- private java.util.Vector cachedSerQNames = new java.util.Vector();
- private java.util.Vector cachedSerFactories = new java.util.Vector();
- private java.util.Vector cachedDeserFactories = new java.util.Vector();
-
- static org.apache.axis.description.OperationDesc [] _operations;
-
- static {
- _operations = new org.apache.axis.description.OperationDesc[1];
- _initOperationDesc1();
- }
-
- private static void _initOperationDesc1(){
- org.apache.axis.description.OperationDesc oper;
- org.apache.axis.description.ParameterDesc param;
- oper = new org.apache.axis.description.OperationDesc();
- oper.setName("CalculateRectArea");
- param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "parameters"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "dimensions"), org.tempuri.AreaService.Dimensions.class, false, false);
- oper.addParameter(param);
- oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"));
- oper.setReturnClass(float.class);
- oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "area"));
- oper.setStyle(org.apache.axis.constants.Style.DOCUMENT);
- oper.setUse(org.apache.axis.constants.Use.LITERAL);
- _operations[0] = oper;
-
- }
-
- public AreaServiceSOAPStub() throws org.apache.axis.AxisFault {
- this(null);
- }
-
- public AreaServiceSOAPStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
- this(service);
- super.cachedEndpoint = endpointURL;
- }
-
- public AreaServiceSOAPStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
- if (service == null) {
- super.service = new org.apache.axis.client.Service();
- } else {
- super.service = service;
- }
- ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
- java.lang.Class cls;
- javax.xml.namespace.QName qName;
- javax.xml.namespace.QName qName2;
- java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
- java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
- java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
- java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
- java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
- java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
- java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
- java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
- java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
- java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
- qName = new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "dimensions");
- cachedSerQNames.add(qName);
- cls = org.tempuri.AreaService.Dimensions.class;
- cachedSerClasses.add(cls);
- cachedSerFactories.add(beansf);
- cachedDeserFactories.add(beandf);
-
- }
-
- protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
- try {
- org.apache.axis.client.Call _call = super._createCall();
- if (super.maintainSessionSet) {
- _call.setMaintainSession(super.maintainSession);
- }
- if (super.cachedUsername != null) {
- _call.setUsername(super.cachedUsername);
- }
- if (super.cachedPassword != null) {
- _call.setPassword(super.cachedPassword);
- }
- if (super.cachedEndpoint != null) {
- _call.setTargetEndpointAddress(super.cachedEndpoint);
- }
- if (super.cachedTimeout != null) {
- _call.setTimeout(super.cachedTimeout);
- }
- if (super.cachedPortName != null) {
- _call.setPortName(super.cachedPortName);
- }
- java.util.Enumeration keys = super.cachedProperties.keys();
- while (keys.hasMoreElements()) {
- java.lang.String key = (java.lang.String) keys.nextElement();
- _call.setProperty(key, super.cachedProperties.get(key));
- }
- // All the type mapping information is registered
- // when the first call is made.
- // The type mapping information is actually registered in
- // the TypeMappingRegistry of the service, which
- // is the reason why registration is only needed for the first call.
- synchronized (this) {
- if (firstCall()) {
- // must set encoding style before registering serializers
- _call.setEncodingStyle(null);
- for (int i = 0; i < cachedSerFactories.size(); ++i) {
- java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i);
- javax.xml.namespace.QName qName =
- (javax.xml.namespace.QName) cachedSerQNames.get(i);
- java.lang.Object x = cachedSerFactories.get(i);
- if (x instanceof Class) {
- java.lang.Class sf = (java.lang.Class)
- cachedSerFactories.get(i);
- java.lang.Class df = (java.lang.Class)
- cachedDeserFactories.get(i);
- _call.registerTypeMapping(cls, qName, sf, df, false);
- }
- else if (x instanceof javax.xml.rpc.encoding.SerializerFactory) {
- org.apache.axis.encoding.SerializerFactory sf = (org.apache.axis.encoding.SerializerFactory)
- cachedSerFactories.get(i);
- org.apache.axis.encoding.DeserializerFactory df = (org.apache.axis.encoding.DeserializerFactory)
- cachedDeserFactories.get(i);
- _call.registerTypeMapping(cls, qName, sf, df, false);
- }
- }
- }
- }
- return _call;
- }
- catch (java.lang.Throwable _t) {
- throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
- }
- }
-
- public float calculateRectArea(org.tempuri.AreaService.Dimensions parameters) throws java.rmi.RemoteException {
- if (super.cachedEndpoint == null) {
- throw new org.apache.axis.NoEndPointException();
- }
- org.apache.axis.client.Call _call = createCall();
- _call.setOperation(_operations[0]);
- _call.setUseSOAPAction(true);
- _call.setSOAPActionURI("http://tempuri.org/AreaService/NewOperation");
- _call.setEncodingStyle(null);
- _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
- _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
- _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
- _call.setOperationName(new javax.xml.namespace.QName("", "CalculateRectArea"));
-
- setRequestHeaders(_call);
- setAttachments(_call);
- try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {parameters});
-
- if (_resp instanceof java.rmi.RemoteException) {
- throw (java.rmi.RemoteException)_resp;
- }
- else {
- extractAttachments(_call);
- try {
- return ((java.lang.Float) _resp).floatValue();
- } catch (java.lang.Exception _exception) {
- return ((java.lang.Float) org.apache.axis.utils.JavaUtils.convert(_resp, float.class)).floatValue();
- }
- }
- } catch (org.apache.axis.AxisFault axisFaultException) {
- throw axisFaultException;
-}
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_PortType.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_PortType.java
deleted file mode 100644
index 2a65f66..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_PortType.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * AreaService_PortType.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package org.tempuri.AreaService;
-
-public interface AreaService_PortType extends java.rmi.Remote {
- public float calculateRectArea(org.tempuri.AreaService.Dimensions parameters) throws java.rmi.RemoteException;
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_Service.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_Service.java
deleted file mode 100644
index 8409325..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_Service.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * AreaService_Service.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package org.tempuri.AreaService;
-
-public interface AreaService_Service extends javax.xml.rpc.Service {
- public java.lang.String getAreaServiceSOAPAddress();
-
- public org.tempuri.AreaService.AreaService_PortType getAreaServiceSOAP() throws javax.xml.rpc.ServiceException;
-
- public org.tempuri.AreaService.AreaService_PortType getAreaServiceSOAP(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_ServiceLocator.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_ServiceLocator.java
deleted file mode 100644
index 27dfc0f..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_ServiceLocator.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * AreaService_ServiceLocator.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package org.tempuri.AreaService;
-
-public class AreaService_ServiceLocator extends org.apache.axis.client.Service implements org.tempuri.AreaService.AreaService_Service {
-
- public AreaService_ServiceLocator() {
- }
-
-
- public AreaService_ServiceLocator(org.apache.axis.EngineConfiguration config) {
- super(config);
- }
-
- public AreaService_ServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException {
- super(wsdlLoc, sName);
- }
-
- // Use to get a proxy class for AreaServiceSOAP
- private java.lang.String AreaServiceSOAP_address = "http://localhost:8080/AreaProj/services/AreaServiceSOAP";
-
- public java.lang.String getAreaServiceSOAPAddress() {
- return AreaServiceSOAP_address;
- }
-
- // The WSDD service name defaults to the port name.
- private java.lang.String AreaServiceSOAPWSDDServiceName = "AreaServiceSOAP";
-
- public java.lang.String getAreaServiceSOAPWSDDServiceName() {
- return AreaServiceSOAPWSDDServiceName;
- }
-
- public void setAreaServiceSOAPWSDDServiceName(java.lang.String name) {
- AreaServiceSOAPWSDDServiceName = name;
- }
-
- public org.tempuri.AreaService.AreaService_PortType getAreaServiceSOAP() throws javax.xml.rpc.ServiceException {
- java.net.URL endpoint;
- try {
- endpoint = new java.net.URL(AreaServiceSOAP_address);
- }
- catch (java.net.MalformedURLException e) {
- throw new javax.xml.rpc.ServiceException(e);
- }
- return getAreaServiceSOAP(endpoint);
- }
-
- public org.tempuri.AreaService.AreaService_PortType getAreaServiceSOAP(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
- try {
- org.tempuri.AreaService.AreaServiceSOAPStub _stub = new org.tempuri.AreaService.AreaServiceSOAPStub(portAddress, this);
- _stub.setPortName(getAreaServiceSOAPWSDDServiceName());
- return _stub;
- }
- catch (org.apache.axis.AxisFault e) {
- return null;
- }
- }
-
- public void setAreaServiceSOAPEndpointAddress(java.lang.String address) {
- AreaServiceSOAP_address = address;
- }
-
- /**
- * For the given interface, get the stub implementation.
- * If this service has no port for the given interface,
- * then ServiceException is thrown.
- */
- public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
- try {
- if (org.tempuri.AreaService.AreaService_PortType.class.isAssignableFrom(serviceEndpointInterface)) {
- org.tempuri.AreaService.AreaServiceSOAPStub _stub = new org.tempuri.AreaService.AreaServiceSOAPStub(new java.net.URL(AreaServiceSOAP_address), this);
- _stub.setPortName(getAreaServiceSOAPWSDDServiceName());
- return _stub;
- }
- }
- catch (java.lang.Throwable t) {
- throw new javax.xml.rpc.ServiceException(t);
- }
- throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
- }
-
- /**
- * For the given interface, get the stub implementation.
- * If this service has no port for the given interface,
- * then ServiceException is thrown.
- */
- public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
- if (portName == null) {
- return getPort(serviceEndpointInterface);
- }
- java.lang.String inputPortName = portName.getLocalPart();
- if ("AreaServiceSOAP".equals(inputPortName)) {
- return getAreaServiceSOAP();
- }
- else {
- java.rmi.Remote _stub = getPort(serviceEndpointInterface);
- ((org.apache.axis.client.Stub) _stub).setPortName(portName);
- return _stub;
- }
- }
-
- public javax.xml.namespace.QName getServiceName() {
- return new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "AreaService");
- }
-
- private java.util.HashSet ports = null;
-
- public java.util.Iterator getPorts() {
- if (ports == null) {
- ports = new java.util.HashSet();
- ports.add(new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "AreaServiceSOAP"));
- }
- return ports.iterator();
- }
-
- /**
- * Set the endpoint address for the specified port name.
- */
- public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
-
-if ("AreaServiceSOAP".equals(portName)) {
- setAreaServiceSOAPEndpointAddress(address);
- }
- else
-{ // Unknown Port Name
- throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
- }
- }
-
- /**
- * Set the endpoint address for the specified port name.
- */
- public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
- setEndpointAddress(portName.getLocalPart(), address);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/Dimensions.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/Dimensions.java
deleted file mode 100644
index 1310f94..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/Dimensions.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * Dimensions.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package org.tempuri.AreaService;
-
-public class Dimensions implements java.io.Serializable {
- private float width;
- private float height;
-
- public Dimensions() {
- }
-
- public Dimensions(
- float width,
- float height) {
- this.width = width;
- this.height = height;
- }
-
-
- /**
- * Gets the width value for this Dimensions.
- *
- * @return width
- */
- public float getWidth() {
- return width;
- }
-
-
- /**
- * Sets the width value for this Dimensions.
- *
- * @param width
- */
- public void setWidth(float width) {
- this.width = width;
- }
-
-
- /**
- * Gets the height value for this Dimensions.
- *
- * @return height
- */
- public float getHeight() {
- return height;
- }
-
-
- /**
- * Sets the height value for this Dimensions.
- *
- * @param height
- */
- public void setHeight(float height) {
- this.height = height;
- }
-
- private java.lang.Object __equalsCalc = null;
- public synchronized boolean equals(java.lang.Object obj) {
- if (!(obj instanceof Dimensions)) return false;
- Dimensions other = (Dimensions) obj;
- if (obj == null) return false;
- if (this == obj) return true;
- if (__equalsCalc != null) {
- return (__equalsCalc == obj);
- }
- __equalsCalc = obj;
- boolean _equals;
- _equals = true &&
- this.width == other.getWidth() &&
- this.height == other.getHeight();
- __equalsCalc = null;
- return _equals;
- }
-
- private boolean __hashCodeCalc = false;
- public synchronized int hashCode() {
- if (__hashCodeCalc) {
- return 0;
- }
- __hashCodeCalc = true;
- int _hashCode = 1;
- _hashCode += new Float(getWidth()).hashCode();
- _hashCode += new Float(getHeight()).hashCode();
- __hashCodeCalc = false;
- return _hashCode;
- }
-
- // Type metadata
- private static org.apache.axis.description.TypeDesc typeDesc =
- new org.apache.axis.description.TypeDesc(Dimensions.class, true);
-
- static {
- typeDesc.setXmlType(new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "dimensions"));
- org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
- elemField.setFieldName("width");
- elemField.setXmlName(new javax.xml.namespace.QName("", "width"));
- elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"));
- elemField.setNillable(false);
- typeDesc.addFieldDesc(elemField);
- elemField = new org.apache.axis.description.ElementDesc();
- elemField.setFieldName("height");
- elemField.setXmlName(new javax.xml.namespace.QName("", "height"));
- elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"));
- elemField.setNillable(false);
- typeDesc.addFieldDesc(elemField);
- }
-
- /**
- * Return type metadata object
- */
- public static org.apache.axis.description.TypeDesc getTypeDesc() {
- return typeDesc;
- }
-
- /**
- * Get Custom Serializer
- */
- public static org.apache.axis.encoding.Serializer getSerializer(
- java.lang.String mechType,
- java.lang.Class _javaType,
- javax.xml.namespace.QName _xmlType) {
- return
- new org.apache.axis.encoding.ser.BeanSerializer(
- _javaType, _xmlType, typeDesc);
- }
-
- /**
- * Get Custom Deserializer
- */
- public static org.apache.axis.encoding.Deserializer getDeserializer(
- java.lang.String mechType,
- java.lang.Class _javaType,
- javax.xml.namespace.QName _xmlType) {
- return
- new org.apache.axis.encoding.ser.BeanDeserializer(
- _javaType, _xmlType, typeDesc);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/Converter.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/Converter.java
deleted file mode 100644
index dca7d40..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/Converter.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * Converter.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package wtp;
-
-public interface Converter extends java.rmi.Remote {
- public float celsiusToFarenheit(float celsius) throws java.rmi.RemoteException;
- public float farenheitToCelsius(float farenheit) throws java.rmi.RemoteException;
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterProxy.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterProxy.java
deleted file mode 100644
index aaa7c46..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterProxy.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package wtp;
-
-public class ConverterProxy implements wtp.Converter {
- private String _endpoint = null;
- private wtp.Converter converter = null;
-
- public ConverterProxy() {
- _initConverterProxy();
- }
-
- private void _initConverterProxy() {
- try {
- converter = (new wtp.ConverterServiceLocator()).getConverter();
- if (converter != null) {
- if (_endpoint != null)
- ((javax.xml.rpc.Stub)converter)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
- else
- _endpoint = (String)((javax.xml.rpc.Stub)converter)._getProperty("javax.xml.rpc.service.endpoint.address");
- }
-
- }
- catch (javax.xml.rpc.ServiceException serviceException) {}
- }
-
- public String getEndpoint() {
- return _endpoint;
- }
-
- public void setEndpoint(String endpoint) {
- _endpoint = endpoint;
- if (converter != null)
- ((javax.xml.rpc.Stub)converter)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
-
- }
-
- public wtp.Converter getConverter() {
- if (converter == null)
- _initConverterProxy();
- return converter;
- }
-
- public float celsiusToFarenheit(float celsius) throws java.rmi.RemoteException{
- if (converter == null)
- _initConverterProxy();
- return converter.celsiusToFarenheit(celsius);
- }
-
- public float farenheitToCelsius(float farenheit) throws java.rmi.RemoteException{
- if (converter == null)
- _initConverterProxy();
- return converter.farenheitToCelsius(farenheit);
- }
-
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterService.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterService.java
deleted file mode 100644
index 6daafe1..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * ConverterService.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package wtp;
-
-public interface ConverterService extends javax.xml.rpc.Service {
- public java.lang.String getConverterAddress();
-
- public wtp.Converter getConverter() throws javax.xml.rpc.ServiceException;
-
- public wtp.Converter getConverter(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterServiceLocator.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterServiceLocator.java
deleted file mode 100644
index caf5cd7..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterServiceLocator.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * ConverterServiceLocator.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package wtp;
-
-public class ConverterServiceLocator extends org.apache.axis.client.Service implements wtp.ConverterService {
-
- public ConverterServiceLocator() {
- }
-
-
- public ConverterServiceLocator(org.apache.axis.EngineConfiguration config) {
- super(config);
- }
-
- public ConverterServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException {
- super(wsdlLoc, sName);
- }
-
- // Use to get a proxy class for Converter
- private java.lang.String Converter_address = "http://localhost:8080/ConverterProj/services/Converter";
-
- public java.lang.String getConverterAddress() {
- return Converter_address;
- }
-
- // The WSDD service name defaults to the port name.
- private java.lang.String ConverterWSDDServiceName = "Converter";
-
- public java.lang.String getConverterWSDDServiceName() {
- return ConverterWSDDServiceName;
- }
-
- public void setConverterWSDDServiceName(java.lang.String name) {
- ConverterWSDDServiceName = name;
- }
-
- public wtp.Converter getConverter() throws javax.xml.rpc.ServiceException {
- java.net.URL endpoint;
- try {
- endpoint = new java.net.URL(Converter_address);
- }
- catch (java.net.MalformedURLException e) {
- throw new javax.xml.rpc.ServiceException(e);
- }
- return getConverter(endpoint);
- }
-
- public wtp.Converter getConverter(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
- try {
- wtp.ConverterSoapBindingStub _stub = new wtp.ConverterSoapBindingStub(portAddress, this);
- _stub.setPortName(getConverterWSDDServiceName());
- return _stub;
- }
- catch (org.apache.axis.AxisFault e) {
- return null;
- }
- }
-
- public void setConverterEndpointAddress(java.lang.String address) {
- Converter_address = address;
- }
-
- /**
- * For the given interface, get the stub implementation.
- * If this service has no port for the given interface,
- * then ServiceException is thrown.
- */
- public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
- try {
- if (wtp.Converter.class.isAssignableFrom(serviceEndpointInterface)) {
- wtp.ConverterSoapBindingStub _stub = new wtp.ConverterSoapBindingStub(new java.net.URL(Converter_address), this);
- _stub.setPortName(getConverterWSDDServiceName());
- return _stub;
- }
- }
- catch (java.lang.Throwable t) {
- throw new javax.xml.rpc.ServiceException(t);
- }
- throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
- }
-
- /**
- * For the given interface, get the stub implementation.
- * If this service has no port for the given interface,
- * then ServiceException is thrown.
- */
- public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
- if (portName == null) {
- return getPort(serviceEndpointInterface);
- }
- java.lang.String inputPortName = portName.getLocalPart();
- if ("Converter".equals(inputPortName)) {
- return getConverter();
- }
- else {
- java.rmi.Remote _stub = getPort(serviceEndpointInterface);
- ((org.apache.axis.client.Stub) _stub).setPortName(portName);
- return _stub;
- }
- }
-
- public javax.xml.namespace.QName getServiceName() {
- return new javax.xml.namespace.QName("http://wtp", "ConverterService");
- }
-
- private java.util.HashSet ports = null;
-
- public java.util.Iterator getPorts() {
- if (ports == null) {
- ports = new java.util.HashSet();
- ports.add(new javax.xml.namespace.QName("http://wtp", "Converter"));
- }
- return ports.iterator();
- }
-
- /**
- * Set the endpoint address for the specified port name.
- */
- public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
-
-if ("Converter".equals(portName)) {
- setConverterEndpointAddress(address);
- }
- else
-{ // Unknown Port Name
- throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
- }
- }
-
- /**
- * Set the endpoint address for the specified port name.
- */
- public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
- setEndpointAddress(portName.getLocalPart(), address);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterSoapBindingStub.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterSoapBindingStub.java
deleted file mode 100644
index 5397aaa..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterSoapBindingStub.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * ConverterSoapBindingStub.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter.
- */
-
-package wtp;
-
-public class ConverterSoapBindingStub extends org.apache.axis.client.Stub implements wtp.Converter {
- private java.util.Vector cachedSerClasses = new java.util.Vector();
- private java.util.Vector cachedSerQNames = new java.util.Vector();
- private java.util.Vector cachedSerFactories = new java.util.Vector();
- private java.util.Vector cachedDeserFactories = new java.util.Vector();
-
- static org.apache.axis.description.OperationDesc [] _operations;
-
- static {
- _operations = new org.apache.axis.description.OperationDesc[2];
- _initOperationDesc1();
- }
-
- private static void _initOperationDesc1(){
- org.apache.axis.description.OperationDesc oper;
- org.apache.axis.description.ParameterDesc param;
- oper = new org.apache.axis.description.OperationDesc();
- oper.setName("celsiusToFarenheit");
- param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://wtp", "celsius"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"), float.class, false, false);
- oper.addParameter(param);
- oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"));
- oper.setReturnClass(float.class);
- oper.setReturnQName(new javax.xml.namespace.QName("http://wtp", "celsiusToFarenheitReturn"));
- oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
- oper.setUse(org.apache.axis.constants.Use.LITERAL);
- _operations[0] = oper;
-
- oper = new org.apache.axis.description.OperationDesc();
- oper.setName("farenheitToCelsius");
- param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://wtp", "farenheit"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"), float.class, false, false);
- oper.addParameter(param);
- oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"));
- oper.setReturnClass(float.class);
- oper.setReturnQName(new javax.xml.namespace.QName("http://wtp", "farenheitToCelsiusReturn"));
- oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
- oper.setUse(org.apache.axis.constants.Use.LITERAL);
- _operations[1] = oper;
-
- }
-
- public ConverterSoapBindingStub() throws org.apache.axis.AxisFault {
- this(null);
- }
-
- public ConverterSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
- this(service);
- super.cachedEndpoint = endpointURL;
- }
-
- public ConverterSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
- if (service == null) {
- super.service = new org.apache.axis.client.Service();
- } else {
- super.service = service;
- }
- ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
- }
-
- protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
- try {
- org.apache.axis.client.Call _call = super._createCall();
- if (super.maintainSessionSet) {
- _call.setMaintainSession(super.maintainSession);
- }
- if (super.cachedUsername != null) {
- _call.setUsername(super.cachedUsername);
- }
- if (super.cachedPassword != null) {
- _call.setPassword(super.cachedPassword);
- }
- if (super.cachedEndpoint != null) {
- _call.setTargetEndpointAddress(super.cachedEndpoint);
- }
- if (super.cachedTimeout != null) {
- _call.setTimeout(super.cachedTimeout);
- }
- if (super.cachedPortName != null) {
- _call.setPortName(super.cachedPortName);
- }
- java.util.Enumeration keys = super.cachedProperties.keys();
- while (keys.hasMoreElements()) {
- java.lang.String key = (java.lang.String) keys.nextElement();
- _call.setProperty(key, super.cachedProperties.get(key));
- }
- return _call;
- }
- catch (java.lang.Throwable _t) {
- throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
- }
- }
-
- public float celsiusToFarenheit(float celsius) throws java.rmi.RemoteException {
- if (super.cachedEndpoint == null) {
- throw new org.apache.axis.NoEndPointException();
- }
- org.apache.axis.client.Call _call = createCall();
- _call.setOperation(_operations[0]);
- _call.setUseSOAPAction(true);
- _call.setSOAPActionURI("");
- _call.setEncodingStyle(null);
- _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
- _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
- _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
- _call.setOperationName(new javax.xml.namespace.QName("http://wtp", "celsiusToFarenheit"));
-
- setRequestHeaders(_call);
- setAttachments(_call);
- try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Float(celsius)});
-
- if (_resp instanceof java.rmi.RemoteException) {
- throw (java.rmi.RemoteException)_resp;
- }
- else {
- extractAttachments(_call);
- try {
- return ((java.lang.Float) _resp).floatValue();
- } catch (java.lang.Exception _exception) {
- return ((java.lang.Float) org.apache.axis.utils.JavaUtils.convert(_resp, float.class)).floatValue();
- }
- }
- } catch (org.apache.axis.AxisFault axisFaultException) {
- throw axisFaultException;
-}
- }
-
- public float farenheitToCelsius(float farenheit) throws java.rmi.RemoteException {
- if (super.cachedEndpoint == null) {
- throw new org.apache.axis.NoEndPointException();
- }
- org.apache.axis.client.Call _call = createCall();
- _call.setOperation(_operations[1]);
- _call.setUseSOAPAction(true);
- _call.setSOAPActionURI("");
- _call.setEncodingStyle(null);
- _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
- _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
- _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
- _call.setOperationName(new javax.xml.namespace.QName("http://wtp", "farenheitToCelsius"));
-
- setRequestHeaders(_call);
- setAttachments(_call);
- try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Float(farenheit)});
-
- if (_resp instanceof java.rmi.RemoteException) {
- throw (java.rmi.RemoteException)_resp;
- }
- else {
- extractAttachments(_call);
- try {
- return ((java.lang.Float) _resp).floatValue();
- } catch (java.lang.Exception _exception) {
- return ((java.lang.Float) org.apache.axis.utils.JavaUtils.convert(_resp, float.class)).floatValue();
- }
- }
- } catch (org.apache.axis.AxisFault axisFaultException) {
- throw axisFaultException;
-}
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties
deleted file mode 100644
index 96ef6c4..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060424 138060 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=JST Web Services Axis Consumption Core Test
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/unittest/LocatorTests.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/unittest/LocatorTests.java
deleted file mode 100644
index 0c7a60b..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/unittest/LocatorTests.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 147862 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.axis.consumption.core.tests.unittest;
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.ws.axis.consumption.core.tests.util.JavaFilter;
-import org.eclipse.jst.ws.axis.consumption.core.tests.util.StdoutProgressMonitor;
-import org.eclipse.jst.ws.axis.consumption.core.tests.util.Util;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceJavaClientInfo;
-import org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-public class LocatorTests extends TestCase
-{
- public static Test suite ()
- {
- return new TestSuite(LocatorTests.class);
- }
-
- public void test_AxisClientLocator ()
- {
- System.out.println("BEGIN test_AxisClientLocator");
- try
- {
- String[] projectNames = new String[] {"Java1","Java2","Java3"};
- IProject[] projects = new IProject[projectNames.length];
- for (int x=0; x<projectNames.length; x++)
- {
- projects[x] = ResourcesPlugin.getWorkspace().getRoot().getProject(projectNames[x]);
- }
- Util.init();
- try
- {
- for (int i=0; i<projects.length; i++)
- {
- IJavaProject javaProject = Util.createJavaProject(projectNames[i]);
- Util.addRequiredJarsToJavaProject(javaProject);
- Util.copyExamplesToJavaProject(javaProject,new JavaFilter());
- }
- }
- catch (Throwable t)
- {
- t.printStackTrace();
- fail("Failed to access or create prerequisite projects");
- }
- WebServiceFinder finder = WebServiceFinder.instance();
- String[] categoryIds = finder.getWebServiceCategoryIds();
- int n = -1;
- IProgressMonitor monitor = new StdoutProgressMonitor();
- for (int i=0; i<categoryIds.length; i++)
- {
- System.out.println("Category ID = ["+categoryIds[i]+"]");
- if (categoryIds[i].equals("org.eclipse.jst.ws.internal.axis.consumption.core.locator.category.axis"))
- {
- n = i;
- Iterator iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],monitor);
- assertFoundClients(iter,6);
- iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],projects,monitor);
- assertFoundClients(iter,6);
- iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],new IProject[] {projects[0]},monitor);
- assertFoundClients(iter,2);
- iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],new IProject[] {projects[1],projects[2]},monitor);
- assertFoundClients(iter,4);
- IProject noSuchProject = ResourcesPlugin.getWorkspace().getRoot().getProject("noSuchProject");
- iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],new IProject[] {noSuchProject},monitor);
- assertFoundClients(iter,0);
- }
- }
- assertTrue("Axis locator extension missing.",n >= 0);
- }
- finally
- {
- System.out.println("ENDED test_AxisClientLocator");
- }
- }
-
- private void assertFoundClients ( Iterator iter, int x )
- {
- int p = 0;
- while (iter.hasNext())
- {
- Object obj = iter.next();
- assertTrue("Finder returned a "+obj.getClass().getName()+" instead of a WebServiceClientInfo.",obj instanceof WebServiceClientInfo);
- p++;
- WebServiceClientInfo wscInfo = (WebServiceClientInfo)obj;
- String proxyClassURL = wscInfo.getImplURL();
- System.out.println("Axis client proxy class = ["+proxyClassURL+"]");
- if (wscInfo instanceof WebServiceJavaClientInfo)
- {
- WebServiceJavaClientInfo wscJInfo = (WebServiceJavaClientInfo)wscInfo;
- assertNotNull("Found an unexpected null IType",wscJInfo.getType());
- System.out.println("Axis client proxy IType = ["+wscJInfo.getType()+"]");
- }
- }
- assertTrue("Found "+p+" proxies instead of the expected "+x+".",p == x);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Filter.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Filter.java
deleted file mode 100644
index ba6c044..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Filter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060711 147862 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.axis.consumption.core.tests.util;
-
-public interface Filter
-{
- public boolean accept ( Object object );
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/JavaFilter.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/JavaFilter.java
deleted file mode 100644
index f76206f..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/JavaFilter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060711 147862 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.axis.consumption.core.tests.util;
-
-public class JavaFilter implements Filter {
-
- public boolean accept ( Object object )
- {
- return object.toString().endsWith(".java");
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/StdoutProgressMonitor.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/StdoutProgressMonitor.java
deleted file mode 100644
index b188b17..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/StdoutProgressMonitor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.axis.consumption.core.tests.util;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class StdoutProgressMonitor extends NullProgressMonitor
-{
-
- public void beginTask(String name, int totalWork)
- {
- System.out.println("[Progress] "+name+", "+totalWork+" unit(s) remaining).");
- }
-
- public void done()
- {
- System.out.println("[Progress] Done.");
- }
-
- public void setTaskName(String name)
- {
- System.out.println("[Progress] "+name);
- }
-
- public void subTask(String name)
- {
- System.out.println("[Progress] "+name);
- }
-
- public void worked(int work)
- {
- System.out.println("[Progress] "+work+" unit(s) completed.");
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java
deleted file mode 100644
index e790268..0000000
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 147862 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 147864 cbrealey@ca.ibm.com - Chris Brealey
- * 20061211 162288 makandre@ca.ibm.com - Andrew Mak, workspace paths with spaces break Java Editor Launch
- *******************************************************************************/
-
-package org.eclipse.jst.ws.axis.consumption.core.tests.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.osgi.framework.Bundle;
-
-public class Util
-{
- /**
- * Initializes this testsuite.
- */
- public static void init ()
- {
- String workspaceOSPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- System.out.println("Workspace = ["+workspaceOSPath+"]");
- }
-
- /**
- * Create a Java project if it doesn't already exist.
- * @param name The name of the project to create.
- * @throws CoreException If the project could not be created.
- */
- public static IJavaProject createJavaProject ( String name )
- throws CoreException
- {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- IProject project = root.getProject(name);
- if (!project.exists())
- {
- System.out.println("Creating project ["+name+"]");
- project.create(null);
- project.open(null);
- IProjectDescription desc = project.getDescription();
- desc.setNatureIds(new String[] {JavaCore.NATURE_ID});
- ICommand cmd = desc.newCommand();
- cmd.setBuilderName(JavaCore.BUILDER_ID);
- desc.setBuildSpec(new ICommand[] {cmd});
- project.setDescription(desc,null);
- }
- System.out.println("Creating Java project ["+name+"]");
- IJavaProject javaProject = JavaCore.create(project);
- javaProject.open(null);
- return javaProject;
- }
-
- /**
- * Adds Axis jars and the JRE to the classpath of the given project.
- * @param javaProject The project to add axis.jar to.
- * @throws JavaModelException If the jar could not be added.
- */
- public static void addRequiredJarsToJavaProject ( IJavaProject javaProject )
- throws CoreException
- {
- // Get the current classpath as a list.
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- List list = new LinkedList(java.util.Arrays.asList(classpath));
-
- // Add the JRE to the list.
- IClasspathEntry con = JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER"));
- list.add(con);
-
- // Add the Axis jars to the list.
- String[] jars = new String[] {
- "org.apache.axis","axis.jar",
- "org.apache.axis","commons-discovery-0.2.jar",
- "org.apache.commons_logging","commons-logging-1.0.4.jar",
- "org.apache.axis","jaxrpc.jar",
- "org.apache.jakarta_log4j","log4j-1.2.8.jar",
- "org.apache.axis","saaj.jar",
- "org.apache.axis","wsdl4j-1.5.1.jar"
- };
-
- for (int i=0; i<jars.length; i+=2)
- {
- IPath jar = getAxisPluginJarPath(jars[i],jars[i+1]);
- System.out.println("Adding jar ["+jar.toString()+"]");
- IClasspathEntry jarEntry = JavaCore.newLibraryEntry(jar,null,null);
- list.add(jarEntry);
- }
-
- // Update the current classpath from the list.
- IClasspathEntry[] newClasspath = (IClasspathEntry[])list.toArray(new IClasspathEntry[0]);
- javaProject.setRawClasspath(newClasspath,null);
- }
-
- /**
- * Returns the filesystem path to the named jar in the Axis plugin.
- * @return The filesystem path to the named jar in the Axis plugin.
- * @throws CoreException If the path could not be computed.
- */
- public static IPath getAxisPluginJarPath ( String pluginName, String jarName )
- throws CoreException
- {
- Bundle bundle = Platform.getBundle(pluginName);
- if (bundle == null)
- {
- throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to locate plugin org.apache.axis",null));
- }
- URL axisURL = FileLocator.find(bundle,new Path("lib/"+jarName),null);
- try
- {
- URL localAxisURL = FileLocator.toFileURL(axisURL);
- File file = new File(new URI(URIEncoder.encode(localAxisURL.toString(), "UTF-8")));
- return new Path(file.toString());
- }
- catch (UnsupportedEncodingException uee) {
- throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to encode jar path for plugin org.apache.axis",uee));
- }
- catch (IOException ioe)
- {
- throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to locate plugin org.apache.axis",ioe));
- }
- catch (URISyntaxException use)
- {
- throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to locate plugin org.apache.axis",use));
- }
- }
-
- /**
- * Copies examples to the given Java project.
- * @param javaProject The project to copy the examples to.
- */
- public static void copyExamplesToJavaProject ( IJavaProject javaProject, Filter filter )
- throws CoreException
- {
- IProject project = javaProject.getProject();
- String sourcePath = project.getName();
- copyExample("org.eclipse.jst.ws.axis.consumption.core.tests","data/axisSource1",sourcePath,filter);
- copyExample("org.eclipse.jst.ws.axis.consumption.core.tests","data/axisSource2",sourcePath,filter);
- project.build(IncrementalProjectBuilder.FULL_BUILD,null);
- try
- {
- System.out.println("Waiting for build to complete");
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,null);
- }
- catch (Throwable t)
- {
- //Do nothing.
- }
- }
-
- /**
- * Recursively copies files from a plugin to the workspace.
- * @param sourcePlugin The plugin to copy from.
- * @param sourceRoot The plugin-related path to copy from.
- * @param targetWorkspacePath The workspace path to copy to.
- */
- public static void copyExample ( String sourcePlugin, String sourceRoot, String targetWorkspacePath, Filter filter )
- throws CoreException
- {
- Bundle bundle = Platform.getBundle(sourcePlugin);
- if (bundle == null)
- {
- throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to locate plugin "+sourcePlugin,null));
- }
- Enumeration e = bundle.getEntryPaths(sourceRoot);
- while (e.hasMoreElements())
- {
- String path = e.nextElement().toString();
- System.out.println("Bundle path = ["+path+"]");
- copyExampleFile(bundle,path,new Path(sourceRoot).segmentCount(),targetWorkspacePath,filter);
- }
- }
-
- public static void copyExampleFile ( Bundle bundle, String path, int offset, String targetWorkspacePath, Filter filter )
- throws CoreException
- {
- IPath reducedPath = new Path(path).removeFirstSegments(offset);
- IPath targetPath = new Path(targetWorkspacePath).append(reducedPath);
- if (path.endsWith("/"))
- {
- System.out.println("Folder = ["+path+"] Target = ["+targetPath+"]");
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(targetPath);
- if (!folder.exists())
- {
- folder.create(true,true,null);
- }
- Enumeration e = bundle.getEntryPaths(path);
- while (e.hasMoreElements())
- {
- String subpath = e.nextElement().toString();
- copyExampleFile(bundle,subpath,offset,targetWorkspacePath,filter);
- }
- }
- else
- {
- System.out.println("File = ["+path+"] Target = ["+targetPath+"]");
- if (filter.accept(path))
- {
- System.out.println("Copied ["+path+"]");
- URL url = bundle.getEntry(path);
- copyFile(url,targetPath);
- }
- }
- }
-
- public static void copyFile ( URL url, IPath targetPath )
- throws CoreException
- {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(targetPath);
- try
- {
- InputStream stream = url.openStream();
- file.create(stream,true,null);
- }
- catch (IOException ioe)
- {
- throw new CoreException(new Status(IStatus.ERROR,"",0,"IOException copying file",ioe));
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.classpath b/tests/org.eclipse.jst.ws.tests.performance/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore b/tests/org.eclipse.jst.ws.tests.performance/.cvsignore
deleted file mode 100644
index 4348109..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-axisPerfmsr.jar
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.project b/tests/org.eclipse.jst.ws.tests.performance/.project
deleted file mode 100644
index 088e1a8..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.tests.performance</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fb6e8e8..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-#Thu May 31 14:28:05 EDT 2007
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 1463cd8..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:54 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
deleted file mode 100644
index 771d7a8..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.tests.performance; singleton:=true
-Bundle-Version: 1.0.202.qualifier
-Bundle-ClassPath: perftests.jar
-Bundle-Activator: org.eclipse.jst.ws.tests.performance.plugin.PerformancePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr,
- org.eclipse.jst.ws.tests.axis2.tomcat.v55.perfmsr,
- org.eclipse.jst.ws.tests.performance,
- org.eclipse.jst.ws.tests.performance.plugin,
- org.eclipse.jst.ws.tests.performance.util
-Require-Bundle: org.eclipse.jst.ws,
- org.eclipse.jst.j2ee.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.wst.server.core,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.jst.ws.tests,
- org.eclipse.jem.util,
- org.eclipse.test.performance,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.modulecore,
- org.eclipse.emf.ecore,
- org.eclipse.jst.ws.consumption,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.command.env,
- org.eclipse.jst.ws.axis2.core
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.jst.ws.tests.performance/about.html b/tests/org.eclipse.jst.ws.tests.performance/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.ws.tests.performance/build.properties b/tests/org.eclipse.jst.ws.tests.performance/build.properties
deleted file mode 100644
index b8484db..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.properties,\
- test.xml,\
- perftests.jar,\
- META-INF/,\
- about.html,\
- bin/
-jars.compile.order = perftests.jar
-source.perftests.jar = src/
-output.perftests.jar = bin/
diff --git a/tests/org.eclipse.jst.ws.tests.performance/plugin.properties b/tests/org.eclipse.jst.ws.tests.performance/plugin.properties
deleted file mode 100644
index 99d89bb..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060424 138060 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=JST Web Services Performance Plug-in
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
deleted file mode 100644
index 1f4c1bf..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070502 185208 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Bottom up performance scenario with Axis and Tomcat v5.0
- */
-public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test {
- // Constants
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS;
- private final String PROJECT_NAME = WSJUnitConstants.BU_PROJECT_NAME;
-
- private IFile sourceFile_;
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to work space
- */
- protected void installInputData() throws Exception
- {
-
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IPath destPath = ResourceUtils.getJavaSourceLocation(webProject);
- IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
- JUnitUtils.copyTestData("BUJava/src",folder,env_, null);
- sourceFile_ = folder.getFile(new Path("foo/Echo.java"));
- // Ensure that Echo.class is built in:
- // <Web Project>/WebContent/WEB-INF/classes/foo/Echo.class
- JUnitUtils.disableValidation(webProject);
- JUnitUtils.syncBuildProject(webProject,env_, null);
-
- }
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- if (webProject==null || !webProject.exists()){
- JUnitUtils.createWebModule(PROJECT_NAME, PROJECT_NAME, server_.getId(), SERVERTYPEID_TC50, "14", env_, new NullProgressMonitor());
- }
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception
- {
- // Set default preferences for Axis and Tomcat 5.0
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- JUnitUtils.setServiceScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception
- {
- initialSelection_ = new StructuredSelection(sourceFile_);
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testBUJavaAxisTC50() throws Exception
- {
- IStatus[] status;
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- JUnitUtils.disableWSIDialog(webProject);
- JUnitUtils.enableOverwrite(true);
- JUnitUtils.setRuntimePreference("org.eclipse.jst.ws.axis.creation.axisWebServiceRT");
-
-
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_BOTTOM_UP,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
-
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- if (performanceMeter==null)
- performanceMeter.dispose();
- }
-
- verifyOutput(status);
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception
- {
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
-
- IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
- assertTrue(wsdlFolder.exists());
- assertTrue(wsdlFolder.members().length > 0);
- assertTrue(webContentFolder.getFolder("wsdl").members().length > 0);
-
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- //show errors
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- System.out.println("BUJava Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- assertTrue(s.length == 0);
- }
-
- /**
- * Clear workspace if necessary
- */
- protected void deleteInputData() throws Exception
- {
- // Remove the EAR from the server.
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- //JUnitUtils.removeModuleFromServer(server_,webProject,env_);
-
- // Delete the Web project.
- webProject.delete(true,true, null);
- assertFalse(webProject.exists());
-
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
deleted file mode 100644
index e4445ef..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070502 185208 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Client performance scenario with Axis and Tomcat v5.0
- */
-public class PerfmsrClientAxisTC50 extends WSWizardTomcat50Test {
-
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS;
-
- private final String CLIENT_PROJECT_NAME = WSJUnitConstants.CLIENT_PROJECT_NAME;
-
- private IFile sourceFile_;
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- if (!webProject.exists()){
- JUnitUtils.createWebModule(CLIENT_PROJECT_NAME, CLIENT_PROJECT_NAME, server_.getId(),SERVERTYPEID_TC50, "14", env_, new NullProgressMonitor());
- }
- }
-
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception {
-
-
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
- JUnitUtils.copyTestData("TDJava",destFolder,env_, null);
- sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
-
- JUnitUtils.disableValidation(webProject);
- JUnitUtils.syncBuildProject(webProject,env_, null);
-
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
- // Set default preferences for Axis and Tomcat 5.0
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- JUnitUtils.setClientScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception {
- initialSelection_ = new StructuredSelection(sourceFile_);
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testClientAxisTC50() throws Exception
- {
- IStatus[] status;
-
- JUnitUtils.enableProxyGeneration(true);
- JUnitUtils.enableOverwrite(true);
- JUnitUtils.setRuntimePreference("org.eclipse.jst.ws.axis.creation.axisWebServiceRT");
-
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_CLIENT,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- if (performanceMeter==null)
- performanceMeter.dispose();
- }
-
- verifyOutput(status);
-
-
- }
-
- /**
- * Verify the scenario completed succesfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception {
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
-
- IPath destPath = ResourceUtils.getJavaSourceLocation(webProject);
- IFolder srcFolder = (IFolder)ResourceUtils.findResource(destPath);
-
- //IFolder srcFolder = JUnitUtils.getSourceFolderForWebProject(CLIENT_PROJECT_NAME);
- IFolder folder = srcFolder.getFolder("foo");
- assertTrue(folder.exists());
- assertTrue(folder.members().length > 0);
-
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- //
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- System.out.println("Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- assertTrue(s.length == 0);
-
- }
-
- /**
- * Remove workspace if necessary
- */
- protected void deleteInputData() throws Exception {
-
- // Delete the Web project.
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- webProject.delete(true,true, null);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
deleted file mode 100644
index 0038320..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070502 185208 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Top down performance scenario with Axis and Tomcat v5.0
- */
-public class PerfmsrTDJavaAxisTC50 extends WSWizardTomcat50Test {
-
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS;
-
- private final String PROJECT_NAME = WSJUnitConstants.TD_PROJECT_NAME;
-
- private IFile sourceFile_;
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- if (!webProject.exists()){
- JUnitUtils.createWebModule(PROJECT_NAME, PROJECT_NAME, server_.getId(), SERVERTYPEID_TC50, "14", env_, new NullProgressMonitor());
- }
- }
-
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception {
-
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
- JUnitUtils.copyTestData("TDJava",destFolder,env_, null);
- sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
-
- JUnitUtils.disableValidation(webProject);
- JUnitUtils.syncBuildProject(webProject,env_, null);
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
- // Set default preferences for Axis and Tomcat v5.0 server
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- JUnitUtils.setServiceScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception {
- initialSelection_ = new StructuredSelection(sourceFile_);
-
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testTDJavaAxisTC50() throws Exception {
-
- IStatus[] status;
- JUnitUtils.enableOverwrite(true);
- JUnitUtils.setRuntimePreference("org.eclipse.jst.ws.axis.creation.axisWebServiceRT");
-
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_TOP_DOWN,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- if (performanceMeter==null)
- performanceMeter.dispose();
- }
-
- verifyOutput(status);
-
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception
- {
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
-
-
- IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
- assertTrue(wsdlFolder.exists());
- assertTrue(wsdlFolder.members().length > 0);
-
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- //
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- System.out.println("TDJava Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- assertTrue(s.length == 0);
- }
-
- /**
- * Clear workspace if required
- */
- protected void deleteInputData() throws Exception {
- // Delete the Web project.
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- webProject.delete(true,true,null);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v55/WSWizardTomcat55Test.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v55/WSWizardTomcat55Test.java
deleted file mode 100644
index e967391..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v55/WSWizardTomcat55Test.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-
-package org.eclipse.jst.ws.tests.axis.tomcat.v55;
-
-import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
-import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
-import org.eclipse.jst.ws.tests.WSWizardTest;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-
-public abstract class WSWizardTomcat55Test extends WSWizardTest {
-
- protected final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.55");
- protected final String RUNTIME_INSTALL_PATH = System.getProperty("org.eclipse.jst.runtime.axis2");
- protected final String RUNTIMETYPEID_TC55 = "org.eclipse.jst.server.tomcat.runtime.55";
- protected final String SERVERTYPEID_TC55 = "org.eclipse.jst.server.tomcat.55";
-
-
- /* (non-Javadoc)
- * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServerRuntime()
- */
- protected void installServerRuntime() throws Exception {
-
- // create server runtime
- serverRuntime_ = JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC55, SERVER_INSTALL_PATH);
-
- // set install locations
- Axis2EmitterContext context = WebServiceAxis2CorePlugin.getDefault().getAxisEmitterContext();
- if (context.getAxis2RuntimeLocation()==null || context.getAxis2RuntimeLocation().equals("")){
- String runtimePath = RUNTIME_INSTALL_PATH;
- if (runtimePath!=null) {
- context.setAxis2RuntimeLocation(runtimePath);
- }
- }
- }
-
-
- /* (non-Javadoc)
- * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServer()
- */
- protected void installServer() throws Exception {
-
- server_ = JUnitUtils.createServer("Apache Tomcat v55", SERVERTYPEID_TC55, serverRuntime_, env_, null );
- }
-
-}
-
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrBUJavaAxis2TC55.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrBUJavaAxis2TC55.java
deleted file mode 100644
index 713f466..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrBUJavaAxis2TC55.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis2.tomcat.v55.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v55.WSWizardTomcat55Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Bottom up performance scenario with Axis2 and Tomcat v5.5
- */
-public final class PerfmsrBUJavaAxis2TC55 extends WSWizardTomcat55Test {
- // Constants
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS2;
- private final String PROJECT_NAME = "BUAxis2Web";
-
- private IFile sourceFile_;
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception
- {
-
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IPath destPath = ResourceUtils.getJavaSourceLocation(webProject);
- IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
- JUnitUtils.copyTestData("BUJava/src",folder,env_, null);
- sourceFile_ = folder.getFile(new Path("foo/Echo.java"));
- // Ensure that Echo.class is built in:
- // <Web Project>/WebContent/WEB-INF/classes/foo/Echo.class
- JUnitUtils.disableValidation(webProject);
- JUnitUtils.syncBuildProject(webProject,env_, null);
- //assertTrue(JUnitUtils.getClassesFolderForWebProject(WEB_PROJECT_NAME).getFile(new Path("foo/Echo.class")).exists());
-
-
- }
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- if (webProject==null || !webProject.exists()){
- JUnitUtils.createWebModule(PROJECT_NAME, PROJECT_NAME, server_.getId(), SERVERTYPEID_TC55, "14", env_, new NullProgressMonitor());
- }
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception
- {
- // Set default preferences for Axis2 and Tomcat 5.5
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC55);
- JUnitUtils.setServiceScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception
- {
- initialSelection_ = new StructuredSelection(sourceFile_);
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testBUJavaAxis2TC55() throws Exception
- {
- IStatus[] status;
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- JUnitUtils.disableWSIDialog(webProject);
- JUnitUtils.enableOverwrite(true);
- JUnitUtils.setRuntimePreference(WS_AXIS2_RUNTIME);
-
-
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_BOTTOM_UP,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
-
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- if (performanceMeter==null)
- performanceMeter.dispose();
- }
-
- verifyOutput(status);
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception
- {
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
-
- IFolder webInfFolder = webContentFolder.getFolder("WEB-INF");
- IFolder servicesFolder = webInfFolder.getFolder("services");
- assertTrue(servicesFolder.exists());
- IFolder wsFolder = servicesFolder.getFolder("Echo");
- assertTrue(wsFolder.exists());
- assertTrue(wsFolder.members().length > 0);
-
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- //show errors
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- System.out.println("BUJava Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- assertTrue(s.length == 0);
- }
-
- /**
- * Clear workspace if necessary
- */
- protected void deleteInputData() throws Exception
- {
- // Remove the EAR from the server.
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- //JUnitUtils.removeModuleFromServer(server_,webProject,env_);
-
- // Delete the Web project.
- webProject.delete(true,true, null);
- assertFalse(webProject.exists());
-
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrClientAxis2TC55.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrClientAxis2TC55.java
deleted file mode 100644
index 05ac3db..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrClientAxis2TC55.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis2.tomcat.v55.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v55.WSWizardTomcat55Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Client performance scenario with Axis2 and Tomcat v5.5
- */
-public class PerfmsrClientAxis2TC55 extends WSWizardTomcat55Test {
-
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS2;
-
- private final String CLIENT_PROJECT_NAME = "ClientAxis2Web";
-
- private IFile sourceFile_;
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- if (!webProject.exists()){
- JUnitUtils.createWebModule(CLIENT_PROJECT_NAME, CLIENT_PROJECT_NAME, server_.getId(),SERVERTYPEID_TC55, "14", env_, new NullProgressMonitor());
- }
- }
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception {
-
-
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
- JUnitUtils.copyTestData("TDJava",destFolder,env_, null);
- sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
- JUnitUtils.disableValidation(webProject);
- JUnitUtils.syncBuildProject(webProject,env_, null);
-
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
- // Set default preferences for Axis and Tomcat 5.5
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC55);
- JUnitUtils.setClientScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception {
- initialSelection_ = new StructuredSelection(sourceFile_);
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testClientAxis2TC55() throws Exception
- {
- IStatus[] status;
-
- JUnitUtils.enableProxyGeneration(true);
- JUnitUtils.enableOverwrite(true);
- JUnitUtils.setRuntimePreference(WS_AXIS2_RUNTIME);
-
-
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_CLIENT,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- if (performanceMeter==null)
- performanceMeter.dispose();
- }
-
- verifyOutput(status);
-
-
- }
-
- /**
- * Verify the scenario completed succesfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception {
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
-
- IPath destPath = ResourceUtils.getJavaSourceLocation(webProject);
- IFolder srcFolder = (IFolder)ResourceUtils.findResource(destPath);
-
- //IFolder srcFolder = JUnitUtils.getSourceFolderForWebProject(CLIENT_PROJECT_NAME);
- IFolder folder = srcFolder.getFolder("foo");
- assertTrue(folder.exists());
- assertTrue(folder.members().length > 0);
-
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- //
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- System.out.println("Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- assertTrue(s.length == 0);
-
- }
-
- /**
- * Remove workspace if necessary
- */
- protected void deleteInputData() throws Exception {
-
- // Delete the Web project.
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- webProject.delete(true,true, null);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrTDJavaAxis2TC55.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrTDJavaAxis2TC55.java
deleted file mode 100644
index 7732d2c..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrTDJavaAxis2TC55.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis2.tomcat.v55.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v55.WSWizardTomcat55Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Top down performance scenario with Axis2 and Tomcat v5.5
- */
-public class PerfmsrTDJavaAxis2TC55 extends WSWizardTomcat55Test {
-
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS2;
-
- private final String PROJECT_NAME = "TDAxis2Web";
-
- private IFile sourceFile_;
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- if (!webProject.exists()){
- JUnitUtils.createWebModule(PROJECT_NAME, PROJECT_NAME, server_.getId(), SERVERTYPEID_TC55, "14", env_, new NullProgressMonitor());
- }
- }
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception {
-
-
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
- JUnitUtils.copyTestData("TDJava",destFolder,env_, null);
- sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
- JUnitUtils.disableValidation(webProject);
- JUnitUtils.syncBuildProject(webProject,env_, null);
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
- // Set default preferences for Axis and Tomcat v5.5 server
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC55);
- JUnitUtils.setServiceScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception {
- initialSelection_ = new StructuredSelection(sourceFile_);
-
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testTDJavaAxis2TC55() throws Exception {
-
- IStatus[] status;
- JUnitUtils.enableOverwrite(true);
- JUnitUtils.setRuntimePreference(WS_AXIS2_RUNTIME);
-
-
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_TOP_DOWN,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- if (performanceMeter==null)
- performanceMeter.dispose();
- }
-
- verifyOutput(status);
-
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception
- {
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
-
- IFolder webInfFolder = webContentFolder.getFolder("WEB-INF");
- IFolder servicesFolder = webInfFolder.getFolder("services");
- assertTrue(servicesFolder.exists());
- IFolder wsFolder = servicesFolder.getFolder("EchoService");
- assertTrue(wsFolder.exists());
- assertTrue(wsFolder.members().length > 0);
-
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- //
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- System.out.println("TDJava Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- assertTrue(s.length == 0);
- }
-
- /**
- * Clear workspace if required
- */
- protected void deleteInputData() throws Exception {
- // Delete the Web project.
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- webProject.delete(true,true,null);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java
deleted file mode 100644
index d12691f..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070502 185208 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50;
-import org.eclipse.jst.ws.tests.axis2.tomcat.v55.perfmsr.PerfmsrBUJavaAxis2TC55;
-import org.eclipse.jst.ws.tests.axis2.tomcat.v55.perfmsr.PerfmsrClientAxis2TC55;
-import org.eclipse.jst.ws.tests.axis2.tomcat.v55.perfmsr.PerfmsrTDJavaAxis2TC55;
-
-public class AllPerformanceTests {
-
- public static Test suite() {
-
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.ws.tests.performance");
- //$JUnit-BEGIN$
-
- // Check for Tomcat 5.0 server
- String s = System.getProperty("org.eclipse.jst.server.tomcat.50");
- if (s==null){
- s = System.getProperty("tomcat50Dir");
- }
-
- if (s != null && s.length() > 0) {
- suite.addTestSuite(PerfmsrBUJavaAxisTC50.class);
- suite.addTestSuite(PerfmsrTDJavaAxisTC50.class);
- suite.addTestSuite(PerfmsrClientAxisTC50.class);
- } else {
- System.err.println("Warning: Tomcat 5.0 not found - performance tests skipped");
- }
-
- // Check for Tomcat 5.5 server
- s = System.getProperty("org.eclipse.jst.server.tomcat.55");
- if (s==null){
- s = System.getProperty("tomcat55Dir");
- }
-
- if (s != null && s.length() > 0) {
- suite.addTestSuite(PerfmsrBUJavaAxis2TC55.class);
- suite.addTestSuite(PerfmsrTDJavaAxis2TC55.class);
- suite.addTestSuite(PerfmsrClientAxis2TC55.class);
- } else {
- System.err.println("Warning: Tomcat 5.5 not found - performance tests skipped");
- }
-
- //$JUnit-END$
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java
deleted file mode 100644
index c8262b4..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070502 185208 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.performance.plugin;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PerformancePlugin extends AbstractUIPlugin {
- //The shared instance.
- private static PerformancePlugin plugin;
-
-
- /**
- * The constructor.
- */
- public PerformancePlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static PerformancePlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java
deleted file mode 100644
index f48f1a3..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jst.ws.tests.performance.util;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.common.environment.ILog;
-
-
-public class EclipsePerformanceLog implements ILog {
-
- private boolean runState = false;
- Performance perf = null;
- PerformanceMeter performanceMeter= null;
-
- public boolean isEnabled() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isEnabled(String option) {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void log(int severity, int messageNum, Object caller, String method, Throwable throwable) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, String option, int messageNum, Object caller, String method, Throwable throwable) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, int messageNum, Object caller, String method, IStatus status) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, String option, int messageNum, Object caller, String method, IStatus status) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, int messageNum, Object caller, String method, Object object) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, String option, int messageNum, Object caller, String method, Object object) {
-
- if (method.equals("runCommand")) {
-
- try {
- if (!runState) {
- // begin performance recording
- perf = Performance.getDefault();
- performanceMeter = perf.createPerformanceMeter(((String)object).toString());
- performanceMeter.start();
- runState = true;
- }
- else {
- // end performance recording
- performanceMeter.stop();
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- performanceMeter.dispose();
- runState = false;
- }
- }
- catch(Exception e) {
- // handle exception
- }
- }
- }
-
-}
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
deleted file mode 100644
index ddd381b..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070321 176886 pmoogk@ca.ibm.com - Peter Moogk
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.performance.util;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.tests.util.DynamicPopupJUnitWizard;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-
-public class PerformanceJUnitUtils {
-
- private static IStatus[] launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler();
-
- DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler);
- wizard.setInitialData(wizardId);
- ProgressMonitorDialog monitor = new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- try {
- wizard.runHeadLess(initialSelection, monitor);
- }
- catch (Exception e){
- e.printStackTrace();
- }
-
- return statusHandler.getAllReports();
-
- }
-
- public static IStatus[] launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection);
- }
-
- public static IStatus[] launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/test.xml b/tests/org.eclipse.jst.ws.tests.performance/test.xml
deleted file mode 100644
index ad0baa5..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/test.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="performance" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.ws.tests.performance"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="perf-tests-file" value="${testDir}/performance-tests.xml"/>
- <property name="workspace" value="${eclipse-home}/workspace_ws_performance"/>
- <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <delete dir="${workspace}" quiet="true"/>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="performance_suite">
-
- <!-- Iteration 1 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <!-- Iteration 2 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <!-- Iteration 3 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <!-- Iteration 4 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <!-- Iteration 5 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <delete dir="${workspace}" quiet="true"/>
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="performance" depends="init,performance_suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.jst.ws.tests*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project>
diff --git a/tests/org.eclipse.jst.ws.tests/.classpath b/tests/org.eclipse.jst.ws.tests/.classpath
deleted file mode 100644
index d23fbaa..0000000
--- a/tests/org.eclipse.jst.ws.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.tests/.cvsignore b/tests/org.eclipse.jst.ws.tests/.cvsignore
deleted file mode 100644
index 57763eb..0000000
--- a/tests/org.eclipse.jst.ws.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
diff --git a/tests/org.eclipse.jst.ws.tests/.project b/tests/org.eclipse.jst.ws.tests/.project
deleted file mode 100644
index fe80d54..0000000
--- a/tests/org.eclipse.jst.ws.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b6940ab..0000000
--- a/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-#Thu May 31 14:27:39 EDT 2007
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 0ea2a1a..0000000
--- a/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:58 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5de22ab..0000000
--- a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.tests;singleton:=true
-Bundle-Version: 1.0.302.qualifier
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.ws.tests.plugin.TestsPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.tests,
- org.eclipse.jst.ws.tests.axis.tomcat.v50,
- org.eclipse.jst.ws.tests.plugin,
- org.eclipse.jst.ws.tests.unittest,
- org.eclipse.jst.ws.tests.util
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.runtime,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.wst.server.core,
- org.eclipse.jem.util,
- org.eclipse.wst.ws,
- org.eclipse.emf.ecore,
- org.eclipse.jst.server.core,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jst.server.tomcat.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.tests,
- org.eclipse.wst.validation,
- org.eclipse.wst.ws.explorer
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.jst.ws.tests/about.html b/tests/org.eclipse.jst.ws.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.jst.ws.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.ws.tests/build.properties b/tests/org.eclipse.jst.ws.tests/build.properties
deleted file mode 100644
index 96576ed..0000000
--- a/tests/org.eclipse.jst.ws.tests/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = data/,\
- plugin.xml,\
- readme.txt,\
- tests.jar,\
- META-INF/,\
- test.xml,\
- about.html,\
- plugin.properties,\
- bin/
-jars.compile.order = tests.jar
-source.tests.jar = tests/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp b/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp
deleted file mode 100644
index 7b0e3b3..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="java.io.*" %>
-<jsp:useBean id="echoProxy" class="foo.EchoProxy" scope="request"/>
-<html>
-<%@ include file = "/outputFilePath.jspf" %>
-<%
- // HTTP/POST parameter:
- // testInput - the String argument to call the proxy with.
- String testInput = request.getParameter("testInput");
-
- // Execute the Web service.
- String result = echoProxy.echoString(testInput);
-
- // Write the result to the outputFilePath.
- PrintWriter pw = null;
- try
- {
- pw = new PrintWriter(new FileOutputStream(outputFilePath));
- pw.print(result);
- pw.flush();
- }
- catch (Exception e)
- {
- }
- finally
- {
- if (pw != null)
- pw.close();
- }
-%>
-</body>
-<p>
-testInput: <%=testInput%>
-<p>
-outputFilePath: <%=outputFilePath%>
-<p>
-The result is <%=result%>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java b/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java
deleted file mode 100644
index 4e893d2..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo;
-
-public class Echo
-{
- public String echoString(String input)
- {
- return input;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl b/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl
deleted file mode 100644
index 46df32f..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://foo" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
- <schema targetNamespace="http://foo" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <element name="echoStringResponse">
- <complexType>
- <sequence>
- <element name="echoStringReturn" nillable="true" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="echoString">
- <complexType>
- <sequence>
- <element name="input" nillable="true" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
-
- <wsdl:message name="echoStringResponse">
-
- <wsdl:part element="impl:echoStringResponse" name="parameters"/>
-
- </wsdl:message>
-
- <wsdl:message name="echoStringRequest">
-
- <wsdl:part element="impl:echoString" name="parameters"/>
-
- </wsdl:message>
-
- <wsdl:portType name="Echo">
-
- <wsdl:operation name="echoString">
-
- <wsdl:input message="impl:echoStringRequest" name="echoStringRequest"/>
-
- <wsdl:output message="impl:echoStringResponse" name="echoStringResponse"/>
-
- </wsdl:operation>
-
- </wsdl:portType>
-
- <wsdl:binding name="EchoSoapBinding" type="impl:Echo">
-
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="echoString">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="echoStringRequest">
-
- <wsdlsoap:body use="literal"/>
-
- </wsdl:input>
-
- <wsdl:output name="echoStringResponse">
-
- <wsdlsoap:body use="literal"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="EchoService">
-
- <wsdl:port binding="impl:EchoSoapBinding" name="Echo">
-
- <wsdlsoap:address location="http://localhost:9080/TestWeb/services/Echo"/>
-
- </wsdl:port>
-
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip b/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip
deleted file mode 100644
index f5d81f9..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip b/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip
deleted file mode 100644
index 8f2e9eb..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf b/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf
deleted file mode 100644
index c8a7aec..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf
+++ /dev/null
@@ -1,6 +0,0 @@
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<%
- String outputFilePath = request.getParameter("outputFilePath");
-%>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/plugin.properties b/tests/org.eclipse.jst.ws.tests/plugin.properties
deleted file mode 100644
index 7e39471..0000000
--- a/tests/org.eclipse.jst.ws.tests/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060424 138060 kathy@ca.ibm.com - Kathy Chan
-# 20070327 172339 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Java Web Services Tools Tests
-PLUGIN_PROVIDER=Eclipse.org
-
-POPUP_TEST_WSDL=Test with Web Services Explorer
-ACTION_GENERATE_JAVA_SKELETON=Generate Java bean skeleton
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-
diff --git a/tests/org.eclipse.jst.ws.tests/plugin.xml b/tests/org.eclipse.jst.ws.tests/plugin.xml
deleted file mode 100644
index af4559b..0000000
--- a/tests/org.eclipse.jst.ws.tests/plugin.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServletLink"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServletLink"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServletLink"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
- menubarPath="additions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
- </action>
- </objectContribution>
-
- </extension>
-
-<extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.ws.tests.util.WSCustomAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webservice.wsdd.ServletLink">
- <adapter type="org.eclipse.core.resources.IFile"/>
- </factory>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.ws.tests.util.WSCustomAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webservice.wsdd.ServletLink">
- <adapter type="java.lang.String"/>
- </factory>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.ws.tests/readme.txt b/tests/org.eclipse.jst.ws.tests/readme.txt
deleted file mode 100644
index 8329546..0000000
--- a/tests/org.eclipse.jst.ws.tests/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The arguments to be passed in are:
-
--Dorg.eclipse.jst.server.tomcat.50=E:\\Tomcat\\Tomcat5.0
-
-, where "org.eclipse.jst.server.tomcat.50" is the install directory of your Tomcat v5.0 server.
diff --git a/tests/org.eclipse.jst.ws.tests/test.xml b/tests/org.eclipse.jst.ws.tests/test.xml
deleted file mode 100644
index 57e4c58..0000000
--- a/tests/org.eclipse.jst.ws.tests/test.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.ws.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="jst-ws-folder" value="${eclipse-home}/jst_ws_folder"/>
- <delete dir="${jst-folder}" quiet="true"/>
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${jst-ws-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.unittest.AllWSJUnitTests" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project>
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java
deleted file mode 100644
index c4b8e16..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071217 187280 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080207 217346 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.tests.plugin.TestsPlugin;
-import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-
-public abstract class WSWizardTest extends TestCase implements WSJUnitConstants
-{
- protected IEnvironment env_;
- protected IRuntime serverRuntime_;
- protected IServer server_;
- protected IStructuredSelection initialSelection_;
-
- public String defaultURL_ = "http://localhost:8080/";
-
- /**
- * Set up the workspace for the Web Service Wizard JUnit test. Setup consists of the following steps:
- * 1) Obtain an instance of the environment.
- * 2) Install the server runtime.
- * 3) Install the input data. This may include projects, source files etc.
- * 4) Install an instance of the server if required. This may also include configuration of the input data on the server.
- * 5) Initialize the J2EE, Web Service Runtime and Server type defaults for the Web Service wizard to use.
- * 6) Initialize the initial selection object to set the context for the Web Service wizard.
- * @throws Exception
- */
- protected void setUp() throws Exception
- {
- // Get an instance of the default environment with the AccumulateStatusHandler to minimize UI dialog blocks.
- PersistentResourceContext resourceContext = PersistentResourceContext.getInstance();
- EclipseStatusHandler handler = new EclipseStatusHandler();
- EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler );
-
- env_ = environment;
- assertTrue(env_ != null);
-
- server_ = null;
- JUnitUtils.hideActionDialogs();
- installServerRuntime();
- installServer();
-
- // unzip pre-configured workspace projects
- //if (!ProjectUtilities.getProject(WSJUnitConstants.BU_PROJECT_NAME).exists())
- createProjects();
-
- installInputData();
- initJ2EEWSRuntimeServerDefaults();
- initInitialSelection();
- }
-
- /**
- * Install the server runtime.
- * @throws Exception
- */
- protected abstract void installServerRuntime() throws Exception;
-
- /**
- * Installs the input data from an aggregator. This ensures that the environment, runtime
- * and server are correctly set on the aggregate since its lifecycle methods are not necessarily
- * called.
- * @param env
- * @param serverRuntime
- * @param server
- * @throws Exception
- */
- public void installInputData(IEnvironment env,IRuntime serverRuntime,IServer server) throws Exception
- {
- env_ = env;
- serverRuntime_ = serverRuntime;
- server_ = server;
- //installInputData();
- }
-
- // Creates projects from the provided ZIP file.
-// public static boolean createProjects() {
-// IPath localZipPath = getLocalPath();
-// ProjectUnzipUtil util = new ProjectUnzipUtil(localZipPath, perf_projectNames);
-// return util.createProjects();
-// }
-
-// private static IPath getLocalPath() {
-// URL url = TestsPlugin.getDefault().find(perf_zipFilePath);
-// try {
-// url = Platform.asLocalURL(url);
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// return new Path(url.getPath());
-// }
-
- /**
- * Create the necessary projects for the tests. This could be Web, Java, or other J2EE projects.
- * @throws Exception
- */
- protected abstract void createProjects() throws Exception;
-
- /**
- * Install the input data for the test. This may include projects, source files etc.
- * @throws Exception
- */
- protected abstract void installInputData() throws Exception;
-
- /**
- * Install an instance of the server. This may also configure input data on the server.
- * @throws Exception
- */
- protected abstract void installServer() throws Exception;
-
- /**
- * Initialize the J2EE level, Web Service runtime type and Server defaults for the test case.
- * @throws Exception
- */
- protected abstract void initJ2EEWSRuntimeServerDefaults() throws Exception;
-
- /**
- * Initialize the initial selection which drives the Web Service wizard. This could include source Java files,
- * WSDL URLs and even EJBs.
- * @throws Exception
- */
- protected abstract void initInitialSelection() throws Exception;
-
- /**
- * Clean up the workspace. Cleanup consists of the following steps:
- * 1) Delete the input data. This should include removal of configuration data on the server if necessary.
- * 2) Stop the server.
- * 3) Delete the server.
- * 4) Delete the server runtime.
- */
- protected void tearDown() throws Exception
- {
- stopServer();
-// deleteServer();
-// deleteInputData();
-// deleteServerRuntime();
- }
-
- /**
- * Delete the input data. This should include removal of projects, src files etc. as well as removal of any server configured data.
- * @throws Exception
- */
- protected abstract void deleteInputData() throws Exception;
-
- /**
- * Stop the server if it is running.
- * @throws Exception
- */
- protected void stopServer() throws Exception
- {
- if (server_ != null && server_.getServerState() == IServer.STATE_STARTED)
- server_.stop(true);
- assertTrue(server_.getServerState() == IServer.STATE_STOPPED);
- }
-
- /**
- * Delete the server.
- * @throws Exception
- */
- protected void deleteServer() throws Exception
- {
- if (server_ != null)
- server_.delete();
- }
-
- /**
- * Delete the server runtime.
- * @throws Exception
- */
- protected void deleteServerRuntime() throws Exception
- {
- if (serverRuntime_ != null)
- serverRuntime_.delete();
- }
-
- /**
- * Get the default URL in the form of: http://localhost:9080/<contextRoot>/<path>
- * @param path - a file or URL relative path.
- * @param contextRoot - the context root of the Web module for this URL.
- * @return
- */
- protected String getDefaultURL(String path,String contextRoot)
- {
- StringBuffer url = new StringBuffer(defaultURL_);
- url.append(contextRoot);
- url.append('/');
- url.append(path);
- return url.toString();
- }
-
- protected void logBadStatus(IStatus status)
- {
- TestsPlugin.getDefault().getLog().log(StatusUtils.infoStatus("*** JST.WS JUNIT ERROR (START) ***"));
- TestsPlugin.getDefault().getLog().log(status);
- TestsPlugin.getDefault().getLog().log(StatusUtils.infoStatus("*** JST.WS JUNIT ERROR (END) ***"));
- }
-
- /**
- * Spin the event loop for awhile to give background activity a chance to
- * die down. This decreases the chance that unrelated background work will
- * affect results for the scenario being tested.
- *
- * @param duration
- * The time in milliseconds to spin the event loop.
- */
- protected void runEventLoop(final int duration) {
- final Display display = Display.getDefault();
- Runnable update = new Runnable() {
- public void run() {
- long start = System.currentTimeMillis();
- while (System.currentTimeMillis() - start < duration) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- }
- };
- if (Display.getCurrent() == null)
- display.syncExec(update);
- else
- update.run();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java
deleted file mode 100644
index f6626b3..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis.tomcat.v50;
-
-import org.eclipse.jst.ws.tests.WSWizardTest;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-
-
-public abstract class WSWizardTomcat50Test extends WSWizardTest {
-
- protected final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
- protected final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
- protected final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
-
-
- /* (non-Javadoc)
- * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServerRuntime()
- */
- protected void installServerRuntime() throws Exception {
-
- serverRuntime_ = JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
- }
-
-
- /* (non-Javadoc)
- * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServer()
- */
- protected void installServer() throws Exception {
-
- server_ = JUnitUtils.createServer("Apache Tomcat v50", SERVERTYPEID_TC50, serverRuntime_, env_, null );
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java
deleted file mode 100644
index 232c7ce..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.plugin;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
- //The shared instance.
- private static TestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.tests.plugin.TestsPlugin");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- */
- public static TestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = TestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
deleted file mode 100644
index 4b09e5e..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- * 20071030 208124 kathy@ca.ibm.com - Kathy Chan
- * 20071031 208124 kathy@ca.ibm.com - Kathy Chan
- * 20071116 208124 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-
-/**
- * This class is to run all the unittest tests.
- */
-public class AllWSJUnitTests extends TestCase implements WSJUnitConstants
-{
- /**
- * Method parseArgs.
- *
- * @param args
- */
- private void parseArgs(Object args)
- {
- // typicially args is an array of strings,
- // not sure when it wouldn't be.
- }
-
- public static void main(String[] args)
- {
- new AllWSJUnitTests().runMain(args);
- }
-
-
- public Object runMain(Object args)
- {
- Object result = null;
- try
- {
- TestRunner testRunner = null;
-
- parseArgs(args);
-
- testRunner = new TestRunner(System.out);
-
- Test suite = suite();
- TestResult testResult = testRunner.doRun(suite, false);
- printHeader(testResult);
- }
- catch (Exception e)
- {
- result = e;
- }
-
- return result;
- }
-
- public static Test suite()
- {
- JUnitUtils.enableOverwrite(true);
-
- TestSuite testSuite = new TestSuite();
- testSuite.addTest( ComponentCreationTests.suite() );
- testSuite.addTest( J2EEUtilsTests.suite() );
-
- // Tests which require a Tomcat server
- String s = System.getProperty("org.eclipse.jst.server.tomcat.50");
- if (s != null && s.length() > 0) {
-// testSuite.addTest( BUJavaAxisTC50.suite() );
- testSuite.addTest( TDJavaAxisTC50.suite() );
- testSuite.addTest( ClientAxisTC50.suite() );
- testSuite.addTest( ServerCreationTests.suite());
-
- }
- testSuite.addTest( ResourceUtilsTests.suite() );
-
- return testSuite;
- }
-
- /**
- * Prints the header of the report
- */
- protected void printHeader(TestResult result)
- {
- if (result.wasSuccessful())
- {
- System.out.println();
- System.out.print("OK");
- System.out.println(" (" + result.runCount() + " tests)");
-
- }
- else
- {
- System.out.println();
- System.out.println("FAILURES!!!");
- System.out.println(
- "Tests run: "
- + result.runCount()
- + ", Failures: "
- + result.failureCount()
- + ", Errors: "
- + result.errorCount());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java
deleted file mode 100644
index c233b02..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071116 208124 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071217 187280 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080207 217346 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080429 228945 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Bottom up performance scenario with Axis and Tomcat v5.0
- */
-public final class BUJavaAxisTC50 extends WSWizardTomcat50Test {
- // Constants
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS;
- private String PROJECT_NAME = WSJUnitConstants.BU_PROJECT_NAME;
-
- private IFile sourceFile_;
-
-
- public static Test suite(){
- return new TestSuite(BUJavaAxisTC50.class);
- }
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception
- {
-
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IPath destPath = ResourceUtils.getJavaSourceLocation(webProject);
- IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
- JUnitUtils.copyTestData("BUJava/src",folder,env_, null);
- sourceFile_ = folder.getFile(new Path("foo/Echo.java"));
- // Ensure that Echo.class is built in:
- // <Web Project>/WebContent/WEB-INF/classes/foo/Echo.class
- JUnitUtils.syncBuildProject(webProject,env_, null);
- //assertTrue(JUnitUtils.getClassesFolderForWebProject(WEB_PROJECT_NAME).getFile(new Path("foo/Echo.class")).exists());
-
-
- }
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- if (webProject==null || !webProject.exists()){
- JUnitUtils.createWebModule(PROJECT_NAME, PROJECT_NAME, server_.getId(), SERVERTYPEID_TC50, "14", env_, new NullProgressMonitor());
- }
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception
- {
- // Set default preferences for Axis and Tomcat 5.0
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- JUnitUtils.setServiceScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception
- {
- initialSelection_ = new StructuredSelection(sourceFile_);
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testBUJavaAxisTC50() throws Exception
- {
- System.out.println();
- System.out.println("BEGIN: BUJavaAxisTC50");
-
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
-
- JUnitUtils.syncBuildProject(webProject, env_, null);
- JUnitUtils.disableWSIDialog(webProject);
-
- IStatus[] status = JUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_BOTTOM_UP,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
-
- verifyOutput(status);
-
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception
- {
- try {
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
-
- IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
- if (!wsdlFolder.exists()){
- runEventLoop(6000); // 6 seconds
- System.out.println("Running event loop while wsdl folder is created...");
- }
- System.out.println("Assert BU wsdl folder exists? = "+wsdlFolder.exists());
- assertTrue(wsdlFolder.exists());
-
- if (!(wsdlFolder.members().length > 0)){
- runEventLoop(6000);
- System.out.println("Running event loop while contents of wsdl foler are created...");
- }
- System.out.println("Assert BU wsdl file exists. # of files = " + (wsdlFolder.members().length > 0));
- assertTrue(wsdlFolder.members().length > 0);
-
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- assertEquals("Assert number of error reports is zero", 0, s.length);
-
- System.out.println("END: BUJavaAxisTC50");
- }
- finally{
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- //
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- logBadStatus(s[i]);
- System.out.println("Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- }
-
- }
-
- /**
- * Clear workspace if necessary
- */
- protected void deleteInputData() throws Exception
- {
- // Remove the EAR from the server.
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- //JUnitUtils.removeModuleFromServer(server_,webProject,env_);
-
- // Delete the Web project.
- webProject.delete(true,true, null);
- assertFalse(webProject.exists());
-
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ClientAxisTC50.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ClientAxisTC50.java
deleted file mode 100644
index 247cda1..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ClientAxisTC50.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071116 208124 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071217 187280 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080207 217346 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080429 228945 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Client performance scenario with Axis and Tomcat v5.0
- */
-public class ClientAxisTC50 extends WSWizardTomcat50Test {
-
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS;
-
- private String CLIENT_PROJECT_NAME = WSJUnitConstants.CLIENT_PROJECT_NAME;
-
- private IFile sourceFile_;
-
-
- public static Test suite(){
- return new TestSuite(ClientAxisTC50.class);
- }
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- if (!webProject.exists()){
- JUnitUtils.createWebModule(CLIENT_PROJECT_NAME, CLIENT_PROJECT_NAME, server_.getId(),SERVERTYPEID_TC50, "14", env_, new NullProgressMonitor());
- }
- }
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception {
-
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
- JUnitUtils.copyTestData("TDJava",destFolder,env_, null);
- sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
- JUnitUtils.syncBuildProject(webProject,env_, null);
-
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
- // Set default preferences for Axis and Tomcat 5.0
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- JUnitUtils.setClientScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception {
- initialSelection_ = new StructuredSelection(sourceFile_);
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testClientAxisTC50() throws Exception
- {
- System.out.println();
- System.out.println("BEGIN: ClientAxisTC50");
-
- JUnitUtils.enableProxyGeneration(true);
- JUnitUtils.enableOverwrite(true);
-
- IStatus[] status = JUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_CLIENT,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
-
- verifyOutput(status);
-
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception {
-
- try {
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
-
- IPath destPath = ResourceUtils.getJavaSourceLocation(webProject);
- IFolder srcFolder = (IFolder)ResourceUtils.findResource(destPath);
-
- //IFolder srcFolder = JUnitUtils.getSourceFolderForWebProject(CLIENT_PROJECT_NAME);
- IFolder folder = srcFolder.getFolder("foo");
- if (!folder.exists()){
- runEventLoop(6000);
- System.out.println("Running event loop while source package is created...");
- }
- System.out.println("Assert client java package exists? = "+folder.exists());
- assertTrue(folder.exists());
-
-
- if (!(folder.members().length > 0)){
- runEventLoop(6000);
- System.out.println("Running event loop while contents of wsdl foler are created...");
- }
- System.out.println("Client Java files exists? = "+(folder.members().length > 0));
- assertTrue(folder.members().length > 0);
-
- // Check status handler for errors
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- assertEquals("Assert number of client error reports is zero", 0, s.length);
-
- System.out.println("END: ClientAxisTC50");
- }
- finally {
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- logBadStatus(s[i]);
- System.out.println("Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- }
- }
-
- /**
- * Remove workspace if necessary
- */
- protected void deleteInputData() throws Exception {
-
- // Delete the Web project.
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- webProject.delete(true,true, null);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
deleted file mode 100644
index 8b2b74e..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import java.io.IOException;
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.etools.common.test.apitools.ProjectUnzipUtil;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.plugin.TestsPlugin;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-
-/**
- * Tests the various Component creation commands
- */
-public class ComponentCreationTests extends TestCase implements WSJUnitConstants {
-
- public static Test suite(){
- return new TestSuite(ComponentCreationTests.class);
- }
-
- public void testWebComponentCreation(){
-
- createServerRuntime();
- createDynamicWebModule(projectNames);
- //createProjects();
- //createWebModule(projectName, projectName, J2EEVersionConstants.J2EE_1_4_ID);
- //createWebModule(project2Name, project2Name, J2EEVersionConstants.J2EE_1_3_ID);
-
- }
-
- // Creates projects from the provided ZIP file.
- public static boolean createProjects() {
- IPath localZipPath = getLocalPath();
- ProjectUnzipUtil util = new ProjectUnzipUtil(localZipPath, projectNames);
- return util.createProjects();
- }
-
-
- private static IPath getLocalPath() {
- URL url = TestsPlugin.getDefault().find(zipFilePath);
- try {
- url = Platform.asLocalURL(url);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return new Path(url.getPath());
- }
-
- public void createServerRuntime(){
-
- try {
- JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
- }
- catch(Exception e){
- e.printStackTrace();
- }
-
- }
-
- public void createDynamicWebModule(String[] projectNames){
-
- for (int i=0;i<projectNames.length;i++) {
- JUnitUtils.createWebModule(projectNames[i], projectNames[i], null, SERVERTYPEID_TC50, "14", null, new NullProgressMonitor());
-
- IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectNames[i]);
- assertTrue(p.exists());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
deleted file mode 100644
index 4a8916c..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * @author sengpl
- *
- */
-public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{
-
- private IProject project1 = null;
- private IProject project2 = null;
- private IProject ejbProject = null;
-
- private String comp1 = webComponentName;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- // Project and component names initialized here!
- project1 = ProjectUtilities.getProject(projectName);
- assertNotNull(project1);
-
- project2 = ProjectUtilities.getProject(project2Name);
- assertNotNull(project2);
-
- ejbProject = ProjectUtilities.getProject(ejbProjectName);
- assertNotNull(ejbProject);
-
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- // TODO Clear the workspace
-
- }
-
- public static Test suite()
- {
- return new TestSuite(J2EEUtilsTests.class);
- }
-
- public void testComponentsExist(){
- System.out.println("< BEGIN: testComponentExists ...");
- IVirtualComponent vc1 = J2EEUtils.getVirtualComponent(project1);
- IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2.getName());
-
- assertTrue(vc1.exists());
- assertTrue(J2EEUtils.exists(project1));
- assertTrue(vc2.exists());
- assertTrue(J2EEUtils.exists(project2.getName(), project2Name));
- System.out.println("< END: testComponentExists ...");
- }
-
- public void testLocationGetterMethods(){
-
- System.out.println("< BEGIN: testLocationGetterMethods ...");
- IPath loc1 = J2EEUtils.getWebContentPath(project1);
- System.out.println("WebContentPath of project1 = "+loc1);
- IResource res = ResourceUtils.getWorkspaceRoot().findMember(loc1);
- assertTrue(res.exists());
- assertTrue(res.toString().endsWith("WebContent"));
-
- IPath loc2 = J2EEUtils.getWebContentPath(project2);
- System.out.println("WebContentPath of project2 = "+loc2);
- IResource res2 = ResourceUtils.getWorkspaceRoot().findMember(loc2);
- assertTrue(res2.exists());
- assertTrue(res2.toString().endsWith("WebContent"));
-
- IPath loc3 = J2EEUtils.getWebInfPath(project1);
- System.out.println("Web-INF path = "+loc3);
- IResource res3 = ResourceUtils.getWorkspaceRoot().findMember(loc3);
- assertTrue(res3.exists());
- assertTrue(res3.toString().endsWith("WEB-INF"));
-
- IContainer container = J2EEUtils.getWebContentContainer(project2);
- IResource res4 = ResourceUtils.getWorkspaceRoot().findMember(container.getFullPath());
- assertEquals(res2, res4);
-
- System.out.println("< END: testLocationGetterMethods ...");
-
- }
-
- public void testJ2EEVersionMethods(){
-
- System.out.println("< BEGIN: testJ2EEVersionMethods ...");
-
- String j3 = J2EEUtils.getJ2EEVersionAsString(project1);
- System.out.println("J2EEVersion p1 as String: "+j3);
- assertEquals(J2EEVersionConstants.VERSION_2_4_TEXT, j3);
-
- IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2);
- int j2 = J2EEUtils.getJ2EEVersion(vc2);
- System.out.println("J2EEVersions p1: "+j2);
- assertEquals(J2EEVersionConstants.SERVLET_2_4, j2);
-
- System.out.println("< END: testJ2EEVersionMethods ...");
- }
-
- public void testComponentGetterMethods(){
-
- System.out.println("< BEGIN: testComponentGetterMethods ...");
-
- IVirtualComponent[] vcs = J2EEUtils.getAllComponents();
- checkVirtualComponentsExists(vcs);
-
- IVirtualComponent[] vcs2 = J2EEUtils.getAllEARComponents();
- checkVirtualComponentsExists(vcs2);
-
- IVirtualComponent[] vcs3 = J2EEUtils.getAllWebComponents();
- checkVirtualComponentsExists(vcs3);
-
- IVirtualComponent[] vcs4 = J2EEUtils.getWebComponents(project1);
- checkVirtualComponentsExists(vcs4);
-
- String[] names = J2EEUtils.getWebComponentNames(project2);
- printNameStrings(names);
-
- String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getComponentsByType(project1, J2EEUtils.WEB | J2EEUtils.EJB));
- printNameStrings(names2);
-
- IProject[] projects = J2EEUtils.getAllFlexibleProjects();
- for (int i=0;i<projects.length;i++){
- System.out.println("Flex project "+i+" = "+projects[i]);
- }
-
- System.out.println("< END: testComponentGetterMethods ...");
- }
-
- private void checkVirtualComponentsExists(IVirtualComponent[] vcs){
- for (int i=0; i<vcs.length;i++){
- IVirtualComponent vc = vcs[i];
- System.out.println("VC: Project = "+vc.getProject()+" Name = "+vc.getName());
- assertTrue(vc.exists());
-
- }
- }
-
- private void printNameStrings(String[] names){
- for (int i=0;i<names.length;i++){
- System.out.println("Name"+i+" = "+names[i]);
- }
- }
-
- public void dtestAssociateComponentCommand(){
-
- System.out.println("< BEGIN: testAssociateComponentCommand ...");
-
- AssociateModuleWithEARCommand amwe = new AssociateModuleWithEARCommand();
- amwe.setEar(earCompName);
- amwe.setEARProject(projectName);
- amwe.setModule(comp1);
- amwe.setProject(projectName);
- amwe.execute(null, null);
-
- System.out.println("< END: testAssociateComponentCommand ...");
- }
-
- public void dtestReferencingGetterMethods(){
-
- System.out.println("< BEGIN: testReferencingGetterMethods ...");
-
- System.out.println("isComponentAssociated ..");
- J2EEUtils.isComponentAssociated(project1, project1);
-
- String[] names = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project1));
- printNameStrings(names);
- String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project2));
- printNameStrings(names2);
-
- String[] names3 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingWebComponentsFromEAR(project1));
- printNameStrings(names3);
-
- System.out.println("< END: testReferencingGetterMethods ...");
- }
-
- public void dtestIsComponentMethods(){
-
- System.out.println("< BEGIN: testIsComponentMethods ...");
-
- //assertFalse(J2EEUtils.isEJB20Component(ejbProject, ejbComponentName));
- assertTrue(J2EEUtils.isEJB20Component(ejbProject));
-
- System.out.println("< END: testIsComponentMethods ...");
- }
-
-
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
deleted file mode 100644
index ec2f6aa..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * Minimal app to run as Eclipse "application"
- */
-public class LaunchTest implements IPlatformRunnable
-{
- /**
- * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object)
- */
- public Object run(Object args) throws Exception
- {
-
- Object result = new AllWSJUnitTests().runMain(args);
-
- if (result != null)
- {
- if (result instanceof Throwable)
- {
- ((Throwable) result).printStackTrace();
- }
- else
- {
- System.out.println("tests didn't return 'ok'");
- }
- return result;
- }
- else
- return IPlatformRunnable.EXIT_OK;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java
deleted file mode 100644
index 69b8ef3..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * JUnit tests for selective ResourceUtils methods. Calls which return a simple String or rely on a IResource
- * API need not be tested. The focus is mainly to exercise Component and Flexible project APIs.
- *
- */
-public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{
-
-
- public static Test suite(){
- return new TestSuite(ResourceUtilsTests.class);
- }
-
- public void testComponentType(){
- IProject project = ProjectUtilities.getProject(projectName);
- String componentType = ResourceUtils.getComponentType(project);
- assertEquals(IModuleConstants.JST_WEB_MODULE, componentType);
- }
-
- public void testComponentOf(){
- IProject project = ProjectUtilities.getProject(projectName);
- IPath destPath = ResourceUtils.getJavaSourceLocation(project);
- IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
- try {
- PersistentResourceContext resourceContext = PersistentResourceContext.getInstance();
- EclipseStatusHandler handler = new EclipseStatusHandler();
- EclipseEnvironment env = new EclipseEnvironment( null, resourceContext, handler );
-
- IFile file = folder.getFile(new Path("foo/Echo.java"));
- if (!file.exists()) {
- JUnitUtils.copyTestData("BUJava/src", folder, env, null );
- }
- }
- catch (Exception ex){
- ex.printStackTrace();
- }
-
- IPath javaFilePath = folder.getFile(new Path("foo/Echo.java")).getFullPath();
- IVirtualComponent vc = ResourceUtils.getComponentOf(javaFilePath);
- assertTrue(vc.exists());
-
-
- }
-
- public void testJavaSourceLocation(){
- IProject project = ProjectUtilities.getProject(projectName);
- String javaSourceLoc = ResourceUtils.getJavaSourceLocation(project).toString();
- System.out.println("Java source location = "+javaSourceLoc);
- assertTrue(javaSourceLoc.endsWith("src"));
-
- // get all the JavaSourceLocations via the VirtualComponent
- IVirtualComponent vc1 = ComponentCore.createComponent(project);
- IVirtualComponent vc2 = ComponentCore.createComponent(project);
- IVirtualComponent[] vcs = new IVirtualComponent[]{vc1, vc2};
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(vcs);
-
- // verify first folder exists
- IPath path1 = (IPath)paths[0];
- IResource resource = ResourceUtils.findResource(path1);
- if (resource.exists()){
- assertEquals(IResource.FOLDER, resource.getType());
- }
-
- // verify second folder exists
- IPath path2 = (IPath)paths[1];
- IResource resource2 = ResourceUtils.findResource(path2);
- if (resource2.exists()){
- assertEquals(IResource.FOLDER, resource2.getType());
- }
- }
-
- public void testWebComponentServerRoot() {
- IProject project = ProjectUtilities.getProject(projectName);
- IFolder folder = ResourceUtils.getWebComponentServerRoot(project);
- assertTrue(folder.exists());
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java
deleted file mode 100644
index fe3d04c..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerCreationTests extends TestCase implements WSJUnitConstants{
-
-
- public static Test suite(){
- return new TestSuite(ServerCreationTests.class);
- }
-
- public void init(){
- try {
- assertNotNull(SERVER_INSTALL_PATH);
- JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
- }
- catch(Exception e){
- e.printStackTrace();
- }
- }
-
- public void testCreateTomcatv5Server(){
- init();
-
- System.out.println("Creating Tomcat v5 server.");
- CreateServerCommand csc = new CreateServerCommand();
- csc.setServerFactoryid(SERVERTYPEID_TC50);
- csc.execute(null, null );
-
- IServer server = null;
- String instId = csc.getServerInstanceId();
- System.out.println("Server instance Id = "+instId);
- if (instId!=null){
- server = ServerCore.findServer(instId);
- }
- assertNotNull(server);
-
- try {
- server.delete();
- }
- catch (CoreException ce){
- new AssertionFailedError();
- }
-
- System.out.println("Done creating Tomcat v5 server.");
- }
-
- public void testReattemptCreateTomcatv5Server(){
- System.out.println("Attempting to create 2nd Tomcat v5 server.");
- CreateServerCommand csc = new CreateServerCommand();
- csc.setServerFactoryid(SERVERTYPEID_TC50);
- csc.execute(null, null );
-
- IServer server = null;
- String instId = csc.getServerInstanceId();
- if (instId!=null) {
- server = ServerCore.findServer(instId);
- }
- assertNotNull(server);
-
- try {
- server.delete();
- }
- catch (CoreException ce){
- new AssertionFailedError();
- }
-
- System.out.println("Done attempting 2nd Tomcat v5 server creation.");
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java
deleted file mode 100644
index 97dc535..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071116 208124 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071217 187280 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080207 217346 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080429 228945 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.wst.command.internal.env.eclipse.AccumulateStatusHandler;
-
-/**
- * Top down performance scenario with Axis and Tomcat v5.0
- */
-public class TDJavaAxisTC50 extends WSWizardTomcat50Test {
-
- private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS;
-
- private String PROJECT_NAME = WSJUnitConstants.TD_PROJECT_NAME;
-
- private IFile sourceFile_;
-
-
- public static Test suite(){
- return new TestSuite(TDJavaAxisTC50.class);
- }
-
- protected void createProjects() throws Exception{
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- if (!webProject.exists()){
- JUnitUtils.createWebModule(PROJECT_NAME, PROJECT_NAME, server_.getId(), SERVERTYPEID_TC50, "14", env_, new NullProgressMonitor());
- }
- }
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception {
-
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
- JUnitUtils.copyTestData("TDJava",destFolder,env_, null);
- sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
- JUnitUtils.syncBuildProject(webProject,env_, null);
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
- // Set default preferences for Axis and Tomcat v5.0 server
- JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- JUnitUtils.setServiceScenarioDefault();
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception {
- initialSelection_ = new StructuredSelection(sourceFile_);
-
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testTDJavaAxisTC50() throws Exception {
-
- System.out.println();
- System.out.println("BEGIN: TDJavaAxisTC50");
-
- IStatus[] status = JUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_TOP_DOWN,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- verifyOutput(status);
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput(IStatus[] status) throws Exception
- {
- try {
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
-
-
- IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
- if (!wsdlFolder.exists()){
- runEventLoop(6000);
- System.out.println("Running event loop while wsdl folder is created...");
- }
- System.out.println("Assert TD wsdl folder exists = "+wsdlFolder.exists());
- assertTrue(wsdlFolder.exists());
-
- if (!(wsdlFolder.members().length > 0)){
- runEventLoop(6000);
- System.out.println("Running event loop while contents of wsdl foler are created...");
- }
- System.out.println("Assert TD wsdl file exists. # of files = " + (wsdlFolder.members().length > 0));
- assertTrue(wsdlFolder.members().length > 0);
-
-
- // Check status handler for errors
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- assertEquals("Assert number of error reports is zero", 0, s.length);
-
- System.out.println("END: TDJavaAxisTC50");
- }
- finally{
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(status);
- IStatus[] s = statusHandler.getErrorReports();
- //
- if (s.length > 0){
- for (int i=0;i<s.length;i++){
- logBadStatus(s[i]);
- System.out.println("Error message for report #"+i+": "+s[i].getMessage());
- }
- }
- }
- }
-
- /**
- * Clear workspace if required
- */
- protected void deleteInputData() throws Exception {
- // Delete the Web project.
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- webProject.delete(true,true,null);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
deleted file mode 100644
index c7624ba..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071116 208124 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import org.eclipse.core.runtime.Path;
-
-
-public interface WSJUnitConstants {
-
- public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
- public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
-
- public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
- public final String WS_RUNTIMEID_AXIS2 = "org.eclipse.jst.ws.runtime.axis2";
-
- public final String WS_AXIS2_RUNTIME = "org.eclipse.jst.ws.axis2.creation.axis2WebServiceRT";
-
- public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
-
- public final String webProjectName = "WebProject";
-
- // flexible project structure 1
- public final String projectName = "FlexProject";
- public final String webComponentName = "webComponent";
- public final String webComponent2Name = "webComp2";
-
- // flexible project structure 2
- public final String project2Name = "FlexProject2";
- public final String webComp3Name = "webComp3";
- public final String webComp4Name = "webComp4";
-
- public final String ejbProjectName = "FlexEJBProject";
- public final String ejbComponentName = "ejbComponent";
-
- public final String appClientProjectName = "FlexAppClientProject";
- public final String appClientCompName = "appClientComponent";
-
- public final String earCompName = "EARComponent";
-
- public final Path zipFilePath = new Path("/data/WSTestProjects.zip");
- public final String[] projectNames = new String[]{projectName, project2Name};
-
- // performance constants
- public final String BU_PROJECT_NAME = "TestWeb";
- public final String TD_PROJECT_NAME = "TestTDProject";
- public final String CLIENT_PROJECT_NAME = "TestWebClient";
-
- public final Path perf_zipFilePath = new Path("/data/WSPerfProjects.zip");
- public final String[] perf_projectNames = new String[]{BU_PROJECT_NAME, TD_PROJECT_NAME, CLIENT_PROJECT_NAME};
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WebServiceRuntimeTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WebServiceRuntimeTests.java
deleted file mode 100644
index 43ac04f..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WebServiceRuntimeTests.java
+++ /dev/null
@@ -1,529 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060518 127189 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.unittest;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.internal.debug.ui.jres.JREsUpdater;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.VMStandin;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.jst.server.tomcat.core.internal.ITomcatRuntimeWorkingCopy;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.FacetMatchCache;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- * WebServiceRuntimeTests contains the JUnit tests which cover project
- * creation, project filtering, and project type filtering for the Axis
- * Web service runtime. In order for the test to run successfully:
- * <ol>
- * <li>The Eclipse test environment must be launched with JDK1.4.2</li>
- * <li>The following VM arguments must be specified:
- * <ul>
- * <li>org.eclipse.jst.server.tomcat.55: the install location of a Tomcat 5.5 server,<br>
- * for example, use -Dorg.eclipse.jst.server.tomcat.55=d:\jakarta-tomcat-5.5.9
- * <li>org.eclipse.jst.server.tomcat.50: the install location of a Tomcat 5.0 server,<br>
- * for example, use -Dorg.eclipse.jst.server.tomcat.50=d:\jakarta-tomcat-5.0.28
- * <li>org.eclipse.jst.server.tomcat.41: the install location of a Tomcat 4.1 server,<br>
- * for example, use -Dorg.eclipse.jst.server.tomcat.41=d:\jakarta-tomcat-4.1.29
- * <li>java.15.install.path: the install location of a Java 1.5 JDK,<br>
- * for example, use -Djava.15.install.path=d:\jdk1.5.0_02
- * </ul></li>
- * </ol>
- *
- *
- */
-public class WebServiceRuntimeTests extends TestCase
-{
-
- //Server install paths
- private final String SERVER_INSTALL_PATH_TC55 = System.getProperty("org.eclipse.jst.server.tomcat.55");
- private final String SERVER_INSTALL_PATH_TC50 = System.getProperty("org.eclipse.jst.server.tomcat.50");
- private final String SERVER_INSTALL_PATH_TC41 = System.getProperty("org.eclipse.jst.server.tomcat.41");
-
- //JDK 1.5 install info
- private final String JAVA15_VM_INSTALL_PATH = System.getProperty("java.15.install.path");
- private final String JAVA15_VM_INSTALL_TYPE = "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType";
- private final String JAVA15_VM_INSTALL_NAME = "Java15";
- private final String JAVA15_VM_INSTALL_JAVADOC = "http://java.sun.com/j2se/1.5.0/docs/api/";
-
- //Runtime type ids ans server type ids
- private final String RUNTIMETYPEID_TC55 = "org.eclipse.jst.server.tomcat.runtime.55";
- private final String SERVERTYPEID_TC55 = "org.eclipse.jst.server.tomcat.55";
- private final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
- private final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
- private final String RUNTIMETYPEID_TC41 = "org.eclipse.jst.server.tomcat.runtime.41";
- private final String SERVERTYPEID_TC41 = "org.eclipse.jst.server.tomcat.41";
-
- //Runtime ids for runtimes that will be created
- private final String RUNTIMEID_TC55 = "Tomcat55Runtime";
- private final String RUNTIMEID_TC50 = "Tomcat50Runtime";
- private final String RUNTIMEID_TC41 = "Tomcat41Runtime";
-
- //Web service runtime extension ids for Axis
- private final String AXIS_RUNTIME = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
- private final String SERVICE_IMPL_JAVA = "org.eclipse.jst.ws.wsImpl.java";
- private final String AXIS_SERVICE_RUNTIME = "org.eclipse.jst.ws.axis.creation.java";
- private final String CLIENT_IMPL_JAVA = "org.eclipse.jst.ws.client.type.java";
- private final String AXIS_CLIENT_RUNTIME_WEB = "org.eclipse.jst.ws.axis.consumption.web";
- private final String AXIS_CLIENT_RUNTIME_JAVA = "org.eclipse.jst.ws.axis.consumption.java";
-
- //Various constants used by the test case for identifying service/client side and
- //for setting names on created projects.
- private final String SERVICE_SIDE = "s";
- private final String CLIENT_SIDE = "c";
- private final String PROJECT_NAME_PREFIX = "tc";
- private final String PROJECT_NAME_SUFFIX = "project";
-
- //IProjectFacetVersions used in the expected results
- private final IProjectFacetVersion WEB23 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE).getVersion(J2EEVersionConstants.VERSION_2_3_TEXT);
- private final IProjectFacetVersion WEB24 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE).getVersion(J2EEVersionConstants.VERSION_2_4_TEXT);
- private final IProjectFacetVersion JAVA14 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_JAVA).getVersion(J2EEVersionConstants.VERSION_1_4_TEXT);
- private final IProjectFacetVersion JAVA50 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_JAVA).getVersion("5.0");
- private final IProjectFacetVersion UTILITY10 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_UTILITY_MODULE).getVersion(J2EEVersionConstants.VERSION_1_0_TEXT);
-
- private final IFacetedProjectTemplate TEMPLATE_WEB = ProjectFacetsManager.getTemplate(IJ2EEModuleConstants.JST_WEB_TEMPLATE);
- private final IFacetedProjectTemplate TEMPLATE_UTILITY = ProjectFacetsManager.getTemplate(IJ2EEModuleConstants.JST_UTILITY_TEMPLATE);
-
- private int multiplesForProjectCreation;
-
- public static Test suite()
- {
- return new TestSuite(WebServiceRuntimeTests.class);
- }
-
- private void init()
- {
- try
- {
- assertNotNull(SERVER_INSTALL_PATH_TC55);
- assertNotNull(SERVER_INSTALL_PATH_TC50);
- assertNotNull(SERVER_INSTALL_PATH_TC41);
- assertNotNull(JAVA15_VM_INSTALL_PATH);
-
- //Create a server runtime: Tomcat 4.1 with JDK 1.4.2
- createTomcatServerRuntime(RUNTIMEID_TC41, RUNTIMETYPEID_TC41, SERVER_INSTALL_PATH_TC41);
-
- //Create a server runtime: Tomcat 5.0 with JDK 1.4.2
- createTomcatServerRuntime(RUNTIMEID_TC50, RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH_TC50);
-
- //Create a server runtime: Tomcat 5.5 with JDK 1.5
- createTomcatServerRuntime(RUNTIMEID_TC55, RUNTIMETYPEID_TC55, SERVER_INSTALL_PATH_TC55);
-
-
-
- String multiples = System.getProperty("multiples"); //this is an optional propery - defaulted to 1
- if (multiples != null && (Integer.parseInt(multiples) > 0))
- {
- multiplesForProjectCreation = Integer.parseInt(multiples);
- }
- else
- {
- multiplesForProjectCreation = 1;
- }
-
- } catch (Exception e)
- {
- e.printStackTrace();
- fail();
- }
- }
-
- private IRuntime createTomcatServerRuntime(String runtimeId, String runtimeTypeId, String serverInstallPath) throws Exception
- {
- IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId);
- IRuntimeWorkingCopy wc = rt.createRuntime(runtimeId, null);
- wc.setLocation(new Path(serverInstallPath));
- IRuntime runtime = wc.save(true, null);
-
- if (runtimeTypeId.equals(RUNTIMETYPEID_TC55))
- {
- //Create a new IVMInstall
- IVMInstallType type = JavaRuntime.getVMInstallType(JAVA15_VM_INSTALL_TYPE);
- IVMInstall newVM = new VMStandin(type, createUniqueId(type));
- newVM.setInstallLocation(new File(JAVA15_VM_INSTALL_PATH).getAbsoluteFile());
- newVM.setName(JAVA15_VM_INSTALL_NAME);
- newVM.setJavadocLocation(new URL(JAVA15_VM_INSTALL_JAVADOC));
- if (newVM instanceof IVMInstall2)
- {
- IVMInstall2 newVM2 = (IVMInstall2) newVM;
- newVM2.setVMArgs(null);
- }
- newVM.setLibraryLocations(null);
-
- //Add the new IVMInstall to the master list.
- IVMInstall[] vms = new IVMInstall[]{newVM};
- //TODO Replace use of the internal class org.eclipse.jdt.internal.debug.ui.jres.JREsUpdater
- //with something public. Not sure if something public is available at this time. Need to check.
- JREsUpdater updater = new JREsUpdater();
- IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
- updater.updateJRESettings(vms, defaultVM);
-
- //Get the new IVMInstall
- IVMInstallType vmType = JavaRuntime.getVMInstallType(JAVA15_VM_INSTALL_TYPE);
- IVMInstall java15VM = vmType.findVMInstallByName(JAVA15_VM_INSTALL_NAME);
-
- //Set the tomcat runtime to use the new Java 15 JDK.
- IRuntimeWorkingCopy wc2 = runtime.createWorkingCopy();
- //TODO Replace use of the internal class
- //org.eclipse.jst.server.tomcat.core.internal.ITomcatRuntimeWorkingCopy
- //with something public. Enhancement 127884 has been opened to request API
- //for this.
- ITomcatRuntimeWorkingCopy tcwc = (ITomcatRuntimeWorkingCopy)wc2.loadAdapter(ITomcatRuntimeWorkingCopy.class, new NullProgressMonitor());
- tcwc.setVMInstall(java15VM);
- wc2.save(true, null);
- }
-
- return ServerCore.findRuntime(runtimeId);
- }
-
- private String createUniqueId(IVMInstallType vmType)
- {
- String id = null;
- do
- {
- id = String.valueOf(System.currentTimeMillis());
- } while (vmType.findVMInstall(id) != null);
- return id;
- }
-
- /**
- * Tests project creation and filtering for the Axis Web service
- * runtime. Tests cover all valid combinations of ServiceRuntimes,
- * Tomcat servers, and J2EE project types and well as all valid
- * combinations of ClientRuntimes, Tomcat servers, and J2EE project types.
- */
- public void testProjectCreationAndFiltering()
- {
- init();
-
- String[] templateIds = new String[]{IJ2EEModuleConstants.JST_WEB_TEMPLATE,
- IJ2EEModuleConstants.JST_WEB_TEMPLATE,
- IJ2EEModuleConstants.JST_WEB_TEMPLATE,
- IJ2EEModuleConstants.JST_WEB_TEMPLATE,
- IJ2EEModuleConstants.JST_WEB_TEMPLATE,
- IJ2EEModuleConstants.JST_WEB_TEMPLATE,
- IJ2EEModuleConstants.JST_UTILITY_TEMPLATE,
- IJ2EEModuleConstants.JST_UTILITY_TEMPLATE,
- IJ2EEModuleConstants.JST_UTILITY_TEMPLATE};
- String[] scenarios = new String[]{SERVICE_SIDE,
- SERVICE_SIDE,
- SERVICE_SIDE,
- CLIENT_SIDE,
- CLIENT_SIDE,
- CLIENT_SIDE,
- CLIENT_SIDE,
- CLIENT_SIDE,
- CLIENT_SIDE};
- String[] serviceClientRuntimeIds = new String[]{AXIS_SERVICE_RUNTIME,
- AXIS_SERVICE_RUNTIME,
- AXIS_SERVICE_RUNTIME,
- AXIS_CLIENT_RUNTIME_WEB,
- AXIS_CLIENT_RUNTIME_WEB,
- AXIS_CLIENT_RUNTIME_WEB,
- AXIS_CLIENT_RUNTIME_JAVA,
- AXIS_CLIENT_RUNTIME_JAVA,
- AXIS_CLIENT_RUNTIME_JAVA};
- String[] serverTypes = new String[]{SERVERTYPEID_TC41,
- SERVERTYPEID_TC50,
- SERVERTYPEID_TC55,
- SERVERTYPEID_TC41,
- SERVERTYPEID_TC50,
- SERVERTYPEID_TC55,
- SERVERTYPEID_TC41,
- SERVERTYPEID_TC50,
- SERVERTYPEID_TC55};
-
-
- //Expected Results:
-
- IProjectFacetVersion[][] expectedFacets = new IProjectFacetVersion[][]{ new IProjectFacetVersion[]{WEB23, JAVA14},
- new IProjectFacetVersion[]{WEB24, JAVA14},
- new IProjectFacetVersion[]{WEB24, JAVA50},
- new IProjectFacetVersion[]{WEB23, JAVA14},
- new IProjectFacetVersion[]{WEB24, JAVA14},
- new IProjectFacetVersion[]{WEB24, JAVA50},
- new IProjectFacetVersion[]{UTILITY10, JAVA14},
- new IProjectFacetVersion[]{UTILITY10, JAVA14},
- new IProjectFacetVersion[]{UTILITY10, JAVA50},
- };
-
- String[] expectedRuntimes = new String[] {RUNTIMEID_TC41,
- RUNTIMEID_TC50,
- RUNTIMEID_TC55,
- RUNTIMEID_TC41,
- RUNTIMEID_TC50,
- RUNTIMEID_TC55,
- RUNTIMEID_TC41,
- RUNTIMEID_TC50,
- RUNTIMEID_TC55
- };
-
- String bigPrefix = PROJECT_NAME_PREFIX+"0"+PROJECT_NAME_SUFFIX;
- String[] expectedProjectsForAxisService = new String[] { bigPrefix+"0",
- bigPrefix+"1",
- bigPrefix+"2",
- bigPrefix+"3",
- bigPrefix+"4",
- bigPrefix+"5"
- };
-
- String[] expectedProjectsForAxisClient = new String[] { bigPrefix+"0",
- bigPrefix+"1",
- bigPrefix+"2",
- bigPrefix+"3",
- bigPrefix+"4",
- bigPrefix+"5",
- bigPrefix+"6",
- bigPrefix+"7",
- bigPrefix+"8",
- };
-
- boolean[] expectedBooleansForAxisService = new boolean[] {true, true, true, true, true, true, false, false, false};
- boolean[] expectedBooleansForAxisClientWeb = new boolean[] {true, true, true, true, true, true, false, false, false};
- boolean[] expectedBooleansForAxisClientJava = new boolean[] {false, false, false, false, false, false, true, true, true};
-
-
- //Turn auto-build off
- ValidationManager manager = new ValidationManager();
- manager.disableAutoBuild();
-
- //Create the projects
- for (int i=0; i<multiplesForProjectCreation; i++)
- {
- createProjects(templateIds, scenarios, serviceClientRuntimeIds, serverTypes, PROJECT_NAME_PREFIX+i);
- }
-
- //Restore auto-build
- manager.restoreAutoBuild();
-
- //Check Expected Results:
-
- //Check facets and runtime on the first "0"th set of created projects. Ignore higher multiples since they
- //are duplicates.
- for (int j=0; j<expectedFacets.length; j++)
- {
- String projectName = bigPrefix+j;
- IProject project = ProjectUtilities.getProject(projectName);
- assertNotNull(project);
- assertTrue(project.exists());
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- assertNotNull(fProject);
-
- //Check facets
- //begin debug
- Iterator pfacets = fProject.getProjectFacets().iterator();
- while (pfacets.hasNext())
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)pfacets.next();
- System.out.println("facet="+pfv.getProjectFacet().getId()+", version="+pfv.getVersionString());
- }
-
- for (int k=0; k<expectedFacets[j].length; k++)
- {
- assertTrue(fProject.hasProjectFacet(expectedFacets[j][k]));
-
- }
-
- //Check runtime
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = fProject.getRuntime();
- assertNotNull(fRuntime);
- IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- assertNotNull(sRuntime);
- assertTrue(sRuntime.getId().equals(expectedRuntimes[j]));
-
- } catch (CoreException ce)
- {
- fail();
- }
-
- }
-
- //Check that WebServiceRuntimeExtensionUtils2.getProjectsForServiceTypeAndRuntime(..) returns
- //the right set of projects
- String serviceType = String.valueOf(WebServiceScenario.BOTTOMUP) + "/" + SERVICE_IMPL_JAVA;
- String[] projectsForAxisService = WebServiceRuntimeExtensionUtils2.getProjectsForServiceTypeAndRuntime(serviceType, AXIS_RUNTIME);
- assertEquals(expectedProjectsForAxisService.length, projectsForAxisService.length);
- List projectsForAxisServiceList = new ArrayList();
- for (int i=0; i<projectsForAxisService.length; i++)
- {
- projectsForAxisServiceList.add(projectsForAxisService[i]);
- }
- for (int i=0; i<expectedProjectsForAxisService.length; i++)
- {
- assertTrue(projectsForAxisServiceList.contains(expectedProjectsForAxisService[i]));
- }
-
- //Check that WebServiceRuntimeExtensionUtils2.getProjectsForClientTypeAndRuntime(..) returns
- //the right set of projects
- String[] projectsForAxisClient = WebServiceRuntimeExtensionUtils2.getProjectsForClientTypeAndRuntime(CLIENT_IMPL_JAVA, AXIS_RUNTIME);
- assertEquals(expectedProjectsForAxisClient.length, projectsForAxisClient.length);
- List projectsForAxisClientList = new ArrayList();
- for (int i=0; i<projectsForAxisClient.length; i++)
- {
- projectsForAxisClientList.add(projectsForAxisClient[i]);
- }
- for (int i=0; i<expectedProjectsForAxisClient.length; i++)
- {
- assertTrue(projectsForAxisClientList.contains(expectedProjectsForAxisClient[i]));
- }
-
- //Check that the Axis service and client runtimes' project compatibility checking is working
- for (int i=0; i<expectedBooleansForAxisService.length; i++)
- {
- String projectName = bigPrefix+i;
- assertEquals(expectedBooleansForAxisService[i], WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportProject(AXIS_SERVICE_RUNTIME, projectName));
- assertEquals(expectedBooleansForAxisClientWeb[i], WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportProject(AXIS_CLIENT_RUNTIME_WEB, projectName));
- assertEquals(expectedBooleansForAxisClientJava[i], WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportProject(AXIS_CLIENT_RUNTIME_JAVA, projectName));
- }
-
- //Turn auto-build off
- manager.disableAutoBuild();
-
- //Delete the projects
- for (int i=0; i<multiplesForProjectCreation; i++)
- {
- deleteProjects(templateIds.length, PROJECT_NAME_PREFIX+i);
- }
-
- //Restore auto-build
- manager.restoreAutoBuild();
- }
-
- private void deleteProjects(int n, String namePrefix)
- {
- for (int i=0; i<n; i++)
- {
- String name = namePrefix + PROJECT_NAME_SUFFIX + i;
- IProject project = ProjectUtilities.getProject(name);
- try
- {
- project.delete(true, null);
- }
- catch (CoreException ce)
- {
- //Don't fail the test case if project deletion fails.
- }
- }
- }
-
- private void createProjects(String[] templateIds, String[] scenarios, String[] serviceClientRuntimeIds, String[] serverTypes, String namePrefix )
- {
- int n = templateIds.length;
- for (int i=0; i<n; i++)
- {
- String name = namePrefix + PROJECT_NAME_SUFFIX + i;
- RequiredFacetVersion[] rfvs = null;
- if (scenarios[i].equals(CLIENT_SIDE))
- {
-
- rfvs = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(serviceClientRuntimeIds[i]).getRequiredFacetVersions();
-
- }
- else
- {
- if (scenarios[i].equals(SERVICE_SIDE))
- {
- rfvs = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceClientRuntimeIds[i]).getRequiredFacetVersions();
- }
- else
- {
- rfvs = new RequiredFacetVersion[0];
- }
- }
-
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(name);
- command.setTemplateId(templateIds[i]);
- command.setRequiredFacetVersions(rfvs);
- command.setServerFactoryId(serverTypes[i]);
- IStatus status = command.execute( new NullProgressMonitor(), null );
- if (status.getSeverity() == Status.ERROR)
- {
- fail();
- }
-
- IProject project = ProjectUtilities.getProject(name);
- FacetUtils.addRequiredFacetsToProject(project, rfvs, new NullProgressMonitor());
- }
- }
-
- /**
- * Tests project type filtering for the Axis Web service runtime.
- * Tests cover all ServiceRuntimes and ClientRuntimes.
- */
- public void testProjectTypeFiltering()
- {
- IFacetedProjectTemplate[] expectedTemplatesForAxisService = new IFacetedProjectTemplate[] {TEMPLATE_WEB};
- IFacetedProjectTemplate[] expectedTemplatesForAxisClientWeb = new IFacetedProjectTemplate[] {TEMPLATE_WEB};
- IFacetedProjectTemplate[] expectedTemplatesForAxisClientJava = new IFacetedProjectTemplate[] {TEMPLATE_UTILITY};
-
- Set templatesForAxisService = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(AXIS_SERVICE_RUNTIME);
- assertEquals(expectedTemplatesForAxisService.length,templatesForAxisService.size());
- for (int i=0; i<expectedTemplatesForAxisService.length; i++)
- {
- assertTrue(templatesForAxisService.contains(expectedTemplatesForAxisService[i]));
- }
- Set templatesForAxisClientWeb = FacetMatchCache.getInstance().getTemplatesForClientRuntime(AXIS_CLIENT_RUNTIME_WEB);
- assertEquals(expectedTemplatesForAxisClientWeb.length, templatesForAxisClientWeb.size());
- for (int i=0; i<expectedTemplatesForAxisClientWeb.length; i++)
- {
- assertTrue(templatesForAxisClientWeb.contains(expectedTemplatesForAxisClientWeb[i]));
- }
- Set templatesForAxisClientJava = FacetMatchCache.getInstance().getTemplatesForClientRuntime(AXIS_CLIENT_RUNTIME_JAVA);
- assertEquals(expectedTemplatesForAxisClientJava.length, templatesForAxisClientJava.size());
- for (int i=0; i<expectedTemplatesForAxisClientJava.length; i++)
- {
- assertTrue(templatesForAxisClientJava.contains(expectedTemplatesForAxisClientJava[i]));
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java
deleted file mode 100644
index 8a72f70..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.eclipse.IEclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard;
-import org.eclipse.wst.common.environment.ILog;
-
-public class DynamicPopupJUnitWizard extends DynamicPopupWizard {
- private IEclipseStatusHandler handler_;
- private ILog log_;
- public DynamicPopupJUnitWizard(IEclipseStatusHandler handler)
- {
- handler_ = handler;
- }
-
- public DynamicPopupJUnitWizard(IEclipseStatusHandler handler, ILog log)
- {
- handler_ = handler;
- log_ = log;
- }
-
- public void runHeadLess(IStructuredSelection selection,IRunnableContext context) {
-
- PersistentResourceContext resourceContext = PersistentResourceContext.getInstance();
- EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler_ );
- if (log_!=null)
- environment.setLog(log_);
-
- DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl();
- DataFlowManager dataManager = new DataFlowManager( dataRegistry_, environment );
- SimpleCommandEngineManager manager = new SimpleCommandEngineManager(environment, dataManager);
-
- try
- {
- commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
- }
- catch( CoreException exc )
- {
- exc.printStackTrace();
- }
-
- commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-
- CommandFragment rootFragment = getRootFragment( selection, null );
- manager.setRootFragment( rootFragment );
- manager.runForwardToNextStop( context );
- }
-
-}
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
deleted file mode 100644
index 6bf4046..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- * 20070502 185208 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070509 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070705 195553 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20071116 208124 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20080313 126774 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.tests.plugin.TestsPlugin;
-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.eclipse.AccumulateStatusHandler;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
-
-
-public class JUnitUtils {
- // Begin Server Utilities
- public static IRuntime createServerRuntime(String runtimeTypeId,String serverInstallPath) throws Exception
- {
- IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId);
- String tcversion = runtimeTypeId.substring(runtimeTypeId.lastIndexOf(".")+1);
- IRuntimeWorkingCopy wc = rt.createRuntime(tcversion+"Runtime", null);
- wc.setLocation(new Path(serverInstallPath));
-
- return wc.save(true, null);
- }
-
- public static IServer createServer(String name,String serverTypeId,IRuntime runtime,IEnvironment env, IProgressMonitor monitor ) throws Exception
- {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- IServer[] servers = ServerCore.getServers();
- for (int i=0;i<servers.length;i++){
- if(servers[i].getServerType().getId().equals(serverType.getId())){
- return servers[i];
- }
- }
-
- IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null, monitor );
- serverWc.setName(name);
- serverWc.setRuntime(runtime);
- IServer server = serverWc.saveAll(true, monitor );
- return server;
- }
-
- /**
- * createServer and install JRE for Servers requiring a specific JRE
- * @param javaRuntimePath JRE install location; i.e. E:\\Java141
- * @param jreID JRE id; i.e. java141
- * @param name server name
- * @param serverTypeId server type id
- * @param runtime IRuntime
- * @param env IEnvironment
- * @return server IServer
- * @throws Exception
- *
- * @deprecated
- */
- public static IServer createServer(String javaRuntimePath, String jreID, String name,String serverTypeId,IRuntime runtime,IEnvironment env, IProgressMonitor monitor ) throws Exception
- {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- IServer[] servers = ServerCore.getServers();
- for (int i=0;i<servers.length;i++){
- if(servers[i].getServerType().getId().equals(serverType.getId())){
- return servers[i];
- }
- }
-
- IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null, monitor );
- serverWc.setName(name);
- serverWc.setRuntime(runtime);
-
- IServer server = serverWc.saveAll(true, monitor );
-
- return server;
- }
-
- public static void startServer(IServer server,IEnvironment env) throws Exception
- {
- final IServer currentServer = server;
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- currentServer.start(ILaunchManager.RUN_MODE, monitor );
- }
- catch (CoreException e)
- {
- InterruptedException wrapper = new InterruptedException(e.getMessage());
- wrapper.setStackTrace(e.getStackTrace());
- throw wrapper;
- }
- }
- };
- PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
- }
-
- public static boolean removeEARFromServer(IServer server,IProject earProject,IEnvironment env, IProgressMonitor monitor ) throws Exception
- {
- int numberOfModules = server.getModules().length;
- if (server != null)
- {
- final IModule earProjectModule = ServerUtil.getModule(earProject);
- final IModule[] modules = {earProjectModule};
- new ServerUtils().modifyModules(env, server,earProjectModule,false, monitor );
- final IServer currentServer = server;
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- for (int i=0;i<1000;i++)
- {
- int moduleState = currentServer.getModuleState(modules);
- if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING)
- {
- try
- {
- Thread.sleep(300);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace(System.err);
- }
- }
- else
- break;
- }
- }
- };
- PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
- return (server.getModules().length == (numberOfModules-1));
- }
- return false;
- }
-
- public static boolean removeModuleFromServer(IServer server, IProject webProject, IEnvironment env, IProgressMonitor monitor ) throws Exception {
-
- int numberOfModules = server.getModules().length;
- if (server != null)
- {
- final IModule webProjectModule = ServerUtil.getModule(webProject);
- final IModule[] modules = {webProjectModule};
-
- new ServerUtils().modifyModules(env, server,webProjectModule,false, monitor );
- final IServer currentServer = server;
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- for (int i=0;i<1000;i++)
- {
- int moduleState = currentServer.getModuleState(modules);
- if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING)
- {
- try
- {
- Thread.sleep(300);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace(System.err);
- }
- }
- else
- break;
- }
- }
- };
- PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
- //Thread.sleep(6000);
- return (server.getModules().length == (numberOfModules-1));
- }
- return false;
- }
-
- // Begin: General Eclipse Utilities
-
- public static void syncBuildProject(IProject project,IEnvironment env, IProgressMonitor monitor ) throws Exception
- {
- project.build(IncrementalProjectBuilder.FULL_BUILD, monitor );
- WaitForAutoBuildCommand cmd = new WaitForAutoBuildCommand();
- cmd.setEnvironment( env );
- cmd.execute( monitor, null );
- }
-
- private static void copyTestFiles(String pathString,int rootSegmentLength,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception
- {
- Enumeration e = TestsPlugin.getDefault().getBundle().getEntryPaths(pathString);
- while (e.hasMoreElements())
- {
- String filePath = (String)e.nextElement();
- if (filePath.endsWith("/"))
- copyTestFiles(filePath,rootSegmentLength,destFolder,env, monitor );
- else
- {
- IPath fileIPath = new Path(filePath);
- FileResourceUtils.copyFile(EnvironmentUtils.getResourceContext(env),
- TestsPlugin.getDefault(),
- fileIPath.removeLastSegments(fileIPath.segmentCount()-rootSegmentLength), // /data/<subdir>
- (new Path(filePath)).removeFirstSegments(rootSegmentLength), // files after /data/<subdir>
- destFolder.getFullPath(),
- monitor,
- env.getStatusHandler());
- }
- }
- }
-
- public static void copyTestData(String dataSubdirectory,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception
- {
- String pathString = "/data/"+dataSubdirectory;
- copyTestFiles(pathString,new Path(pathString).segmentCount(),destFolder,env, monitor);
-
- }
-
- // Begin: Web Services Utilities
- public static void hideActionDialogs()
- {
- PersistentActionDialogsContext actionDialogsCtx = PersistentActionDialogsContext.getInstance();
- ActionDialogPreferenceType[] actionDialogPrefs = actionDialogsCtx.getDialogs();
- for (int i=0;i<actionDialogPrefs.length;i++)
- actionDialogsCtx.setActionDialogEnabled(actionDialogPrefs[i].getId(),true);
- }
-
-
- public static boolean enableProxyGeneration(boolean enable)
- {
- ScenarioContext ctx = WebServicePlugin.getInstance().getScenarioContext();
- boolean previousSetting = ctx.getGenerateProxy();
- ctx.setGenerateProxy(enable);
- return previousSetting;
- }
-
- public static boolean enableOverwrite(boolean enable)
- {
- ResourceContext ctx = WebServicePlugin.getInstance().getResourceContext();
- boolean previousSetting = ctx.isOverwriteFilesEnabled();
- ctx.setOverwriteFilesEnabled(enable);
- return previousSetting;
- }
-
- public static void setRuntimePreference(String rt){
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- context.setRuntimeId(rt);
- }
-
- public static void disableWSIDialog(IProject project){
-
- PersistentWSIContext ctx = WSPlugin.getInstance().getWSIAPContext();
- ctx.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI);
-
- PersistentWSIContext ctx2 = WSPlugin.getInstance().getWSISSBPContext();
- ctx2.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI);
-
- }
-
- public static void setWSRuntimeServer(String wsRuntimeId,String serverTypeId)
- {
- PersistentServerRuntimeContext serverRuntimeCtx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- serverRuntimeCtx.setRuntimeId(wsRuntimeId);
- serverRuntimeCtx.setServerFactoryId(serverTypeId);
- }
-
-
- private static IStatus[] launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler();
-
- DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler);
- wizard.setInitialData(wizardId);
- ProgressMonitorDialog monitor = new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- try {
- wizard.runHeadLess(initialSelection, monitor);
- }
- catch (Exception e){
- e.printStackTrace();
- return new IStatus[]{StatusUtils.errorStatus(e)};
- }
- return statusHandler.getAllReports();
-
- }
-
- public static IStatus[] launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection);
- }
-
- public static IStatus[] launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection);
- }
-
- public static IStatus createWebModule(String webProjectName, String moduleName, String serverInstanceID, String serverFactoryId, String j2eeVersion, IEnvironment env, IProgressMonitor monitor ){
-
- IStatus status = Status.OK_STATUS;
- try{
- CreateFacetedProjectCommand createWeb = new CreateFacetedProjectCommand();
- createWeb.setProjectName(webProjectName);
- createWeb.setProjectName(moduleName);
- createWeb.setTemplateId("template.jst.web");
- createWeb.setServerFactoryId(serverFactoryId);
- createWeb.setServerInstanceId(serverInstanceID);
- createWeb.setRequiredFacetVersions(new RequiredFacetVersion[0]);
- createWeb.setEnvironment( env );
- return createWeb.execute( monitor, null );
- }
- catch (Exception e){
- status = StatusUtils.errorStatus( e );
- }
- return status;
-
- }
-
- public static boolean disableValidation(IProject project){
-
- // disable validators for project
- try
- {
- ValidatorManager vm = ValidatorManager.getManager();
- vm.disableAllValidators(project, null);
-
- }
- catch (Exception e)
- {
- System.out.println("Failed to set Validators...");
- }
-
- return true;
- }
-
- public static void setServiceScenarioDefault() {
- PersistentScenarioContext context = (PersistentScenarioContext)WebServicePlugin.getInstance().getScenarioContext();
- context.setGenerateProxy( false );
- context.setLaunchWebServiceExplorer( false );
- context.setInstallWebService( false );
- context.setInstallClient( false );
- context.setStartWebService( false );
- context.setTestWebService( false );
- context.setMonitorWebService(false);
- context.setGenerateWebService(ScenarioContext.WS_DEVELOP);
- }
-
- public static void setClientScenarioDefault() {
- PersistentScenarioContext context = (PersistentScenarioContext)WebServicePlugin.getInstance().getScenarioContext();
- context.setGenerateProxy( true );
- context.setLaunchWebServiceExplorer( false );
- context.setInstallWebService( false );
- context.setInstallClient( false );
- context.setStartWebService( false );
- context.setTestWebService( false );
- context.setMonitorWebService(false);
- context.setGenerateClient(ScenarioContext.WS_DEVELOP);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java
deleted file mode 100644
index 819e5be..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-public class ScenarioConstants {
- // Bottom up Java or EJB to Web Service wizard ID.
- public static final String WIZARDID_BOTTOM_UP = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard";
-
- // Top down WSDL to Skeleton Web Service wizard ID.
- public static final String WIZARDID_TOP_DOWN = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard";
-
- // Web Service client wizard ID.
- public static final String WIZARDID_CLIENT = "org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard";
-
- // Object class for:
- // 1) Java source (bottom-up)
- // 2) WSDL or WSIL (top-down or client).
- public static final String OBJECT_CLASS_ID_IFILE = "org.eclipse.core.resources.IFile";
-
- // Object class for Java compilation units (i.e. Java classes selected in the Java perspective).
- public static final String OBJECT_CLASS_ID_COMPILATIONUNIT = "org.eclipse.jdt.internal.core.CompilationUnit";
-
- // Object class for a service selected in the J2EE perspective (top-down or client).
- public static final String OBJECT_CLASS_ID_SERVICEIMPL = "org.eclipse.wst.wsdl.Service";
-
- // Object class for a WSDLResourceImpl (top-down or client).
- public static final String OBJECT_CLASS_ID_WSDLSERVICEIMPL = "org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl";
-
- // Object class for a ServiceRef (top-down or client).
- public static final String OBJECT_CLASS_ID_SERVICEREF = "org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef";
-
- // Object class for a ServiceImplBean (bottom-up).
- public static final String OBJECT_CLASS_ID_SERVICEIMPLBEAN = "org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean";
-
- // Object class for a BeanLink (bottom-up).
- public static final String OBJECT_CLASS_ID_BEANLINK = "org.eclipse.jst.j2ee.webservice.wsdd.BeanLink";
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/WSCustomAdapterFactory.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/WSCustomAdapterFactory.java
deleted file mode 100644
index 1ab84ea..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/WSCustomAdapterFactory.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070327 172339 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import java.net.URI;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-
-/**
- * The WSCustomAdapterFactory is an AdapterFactory similar to one an adopter would provide to adapt a custom object
- * to a WSDL uri that the Web services wizards and the Web Services Explorer would take as input. The Servlet Link,
- * representing the service implementation under the JSR-109 Web services branch of the J2EE Project Explorer, is
- * used as the "custom object" in this test.
- *
- */
-public class WSCustomAdapterFactory implements IAdapterFactory {
-
- private static final Class[] types = {
- IFile.class, String.class
- };
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adaptableObject instanceof ServletLink && ((adapterType == IFile.class ) || (adapterType == String.class))) {
- System.out.println("getAdapter on "+adaptableObject.toString());
- ServletLink beanLink = (ServletLink) adaptableObject;
-
- IFile wsdlFile = getWSDLFile(beanLink);
- System.out.println("wsdlFile = "+wsdlFile);
- if (adapterType == IFile.class) {
- return wsdlFile;
- } else
- if (adapterType == String.class) {
- URI wsdlUri = wsdlFile.getLocationURI();
- String wsdlFileString = null;
- if (wsdlUri != null) {
- wsdlFileString = wsdlUri.toString();
- System.out.println("wsdlFileString = "+wsdlFileString);
- }
- return wsdlFileString;
- } else {
- return null;
- }
- }
- else {
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return types;
- }
-
- /**
- * @param bean The ServiceImplBean
- * @return The IFile representing the WSDL file for this ServiceImplBean.
- */
- private IFile getWSDLFile(ServiceImplBean bean) {
- EObject eObject = bean.eContainer();
- if (eObject == null)
- return null;
-
- eObject = eObject.eContainer();
-
- if (eObject instanceof WebServiceDescription) {
- WebServiceDescription wsd = (WebServiceDescription) eObject;
-
- IProject project = ProjectUtilities.getProject(wsd);
-
- IPath path = J2EEUtils.getWebContentPath(project);
- path = path.append(wsd.getWsdlFile());
- return ResourceUtils.getWorkspaceRoot().getFile(path);
-
- }
- return null;
- }
-
- /**
- * @param link The ServletLink
- * @return The IFile representing the WSDL file for this ServletLink
- */
- private IFile getWSDLFile(ServletLink link) {
- EObject eObject = link.eContainer();
- if (eObject instanceof ServiceImplBean)
- return getWSDLFile((ServiceImplBean) eObject);
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/.classpath b/tests/org.eclipse.wst.ws.service.policy.test/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/.project b/tests/org.eclipse.wst.ws.service.policy.test/.project
deleted file mode 100644
index bb3e1a4..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws.service.policy.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.ws.service.policy.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 2156a3a..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.service.policy.test;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.wst.ws.service.policy.test.ServicePolicytTestActivator
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.junit4,
- org.eclipse.wst.ws.service.policy,
- org.eclipse.wst.ws.service.policy.ui,
- org.eclipse.core.resources,
- org.eclipse.wst.ws,
- org.eclipse.core.expressions,
- org.eclipse.ui
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/about.html b/tests/org.eclipse.wst.ws.service.policy.test/about.html
deleted file mode 100644
index 6eafb63..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/build.properties b/tests/org.eclipse.wst.ws.service.policy.test/build.properties
deleted file mode 100644
index 68f43c7..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- plugin.xml,\
- about.html
-src.includes = META-INF/,\
- plugin.properties,\
- plugin.xml,\
- src/
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/plugin.properties b/tests/org.eclipse.wst.ws.service.policy.test/plugin.properties
deleted file mode 100644
index c6f290e..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20071024 196997 pmoogk@ca.ibm.com - Peter Moogk
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Service policy
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/plugin.xml b/tests/org.eclipse.wst.ws.service.policy.test/plugin.xml
deleted file mode 100644
index 352183a..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/plugin.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- We need this plugin to be loaded at startup time so that the
- ServicePolicyPropertyTester class will always be loaded. If this is
- not done then the Service Policy project property page will appear
- on all project property pages until the plugin has been loaded.
- -->
- <extension point="org.eclipse.ui.startup"/>
-
- <extension point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- id="org.eclipse.wst.ws.service.policy.test.service.ws.service.policy.foo"
- type="org.eclipse.core.resources.IProject"
- namespace="org.eclipse.wst.ws.service.policy.test.service.ws.service.policy.foo"
- properties="projectHasFOOfiles"
- class="org.eclipse.wst.ws.service.policy.test.internal.properties.FOOFilePropertyTester">
- </propertyTester>
- </extension>
- <extension point="org.eclipse.wst.ws.service.policy.servicepolicy">
- <servicePolicy>
- <enablement>
- <test property="org.eclipse.wst.ws.service.policy.test.service.ws.service.policy.foo.projectHasFOOfiles"/>
- </enablement>
- <policy parentPolicyId="someparent" id="id1" enumListId="org.eclipse.wst.service.policy.errorWarnEnum" mutable="true">
- <descriptor shortName="id1 shortName" description="id1 description"/>
- <relationship enumList="org.eclipse.wst.warn org.eclipse.wst.error">
- <targetPolicy id="id2"
- itemList="org.eclipse.wst.warn org.eclipse.wst.error"/>
- <targetPolicy id="id3"
- itemList="org.eclipse.wst.warn"/>
- <targetPolicy id="id4"
- itemList="org.eclipse.wst.error"/>
- <targetPolicy id="id22"
- itemList="org.eclipse.wst.warn2 org.eclipse.wst.error2"/>
- <targetPolicy id="id_boolean2"
- itemList="org.eclipse.wst.false"/>
- </relationship>
-
- <relationship enumList="org.eclipse.wst.ignore">
- <targetPolicy id="id3"
- itemList="org.eclipse.wst.warn org.eclipse.wst.error"/>
- </relationship>
- </policy>
-
- <policy id="someparent">
- <descriptor longName="parent longname" />
- </policy>
-
- <policy id="id2" parentPolicyId="someparent"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.warn"
- mutable="true">
- <descriptor shortName="id2 shortname" contextHelpId="somecontextid.A001"/>
- <state key="id2_key" value="id2_value" />
- </policy>
-
- <policy id="id3" parentPolicyId="id2"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id3 short name"/>
- </policy>
- <policy id="id5" parentPolicyId="id3"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id5 short name"/>
- <relationship enumList="org.eclipse.wst.warn">
- <targetPolicy id="id2"
- itemList="org.eclipse.wst.ignore"/>
- </relationship>
- </policy>
- <policy id="id6" parentPolicyId="id5"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id6 short name"/>
- </policy>
-
- <policy id="id10" parentPolicyId="id22"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id10 short name"/>
- </policy>
- <policy id="id11" parentPolicyId="id10"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id11 short name"/>
- <relationship enumList="org.eclipse.wst.warn">
- <targetPolicy id="id2"
- itemList="org.eclipse.wst.ignore"/>
- </relationship>
- </policy>
- <policy id="id12" parentPolicyId="id11"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id12 short name"/>
- </policy>
-
- <policy id="id7" parentPolicyId="id2"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id7 short name"/>
- </policy>
- <policy id="id8" parentPolicyId="id7"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id8 short name"/>
- </policy>
- <policy id="id9" parentPolicyId="id8"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum"
- defaultEnumId="org.eclipse.wst.error">
- <descriptor shortName="id9 short name"/>
- <relationship enumList="org.eclipse.wst.warn">
- <targetPolicy id="id2"
- itemList="org.eclipse.wst.ignore"/>
- </relationship>
- </policy>
-
- <policy id="id4" enumListId="org.eclipse.wst.service.policy.errorWarnEnum">
- <descriptor shortName="id4 short name" longName="id4 long name" />
- </policy>
-
- <policy id="id22" parentPolicyId="someparent"
- enumListId="org.eclipse.wst.service.policy.errorWarnEnum2"
- defaultEnumId="org.eclipse.wst.warn2">
- <descriptor shortName="id22 shortname" contextHelpId="somecontextid.A001"/>
- </policy>
-
- <policy id="id_boolean1" enumListId="org.eclipse.wst.service.policy.booleanEnum"
- defaultEnumId="org.eclipse.wst.true">
- <descriptor shortName="boolean1 short name" longName="boolean1 long name" />
- </policy>
-
- <policy id="id_boolean2" enumListId="org.eclipse.wst.service.policy.booleanEnum"
- defaultEnumId="org.eclipse.wst.true">
- <descriptor shortName="boolean2 short name" longName="boolean2 long name" />
- </policy>
- <enumeration id="org.eclipse.wst.service.policy.errorWarnEnum2"
- default="org.eclipse.wst.ignore2">
- <item id="org.eclipse.wst.ignore2"
- shortName="IGNORE SHORTNAME2" longName="IGNORE LONGNAME2" />
- <item id="org.eclipse.wst.warn2"
- shortName="WARN SHORTNAME2" longName="WARN LONGNAME2" />
- <item id="org.eclipse.wst.error2"
- shortName="ERROR SHORTNAME2" longName="ERROR LONGNAME2" />
- </enumeration>
-
- </servicePolicy>
- </extension>
-
- <extension point="org.eclipse.wst.ws.service.policy.ui.servicepolicyui">
- <servicePolicyUI>
- <operation id="service.ui.operation1" defaultdata="true"
- policyPattern="id3|id2" >
- <descriptor shortName="UI policy1 short name" longName="UI policy1 long name" />
- <enumeration id="org.eclipse.wst.service.policy.errorWarnEnum"/>
- <enabled multiselect="true"/>
- </operation>
-
- <operation id="service.ui.operation2" defaultdata="true"
- policyPattern="id\d.*" >
- <descriptor shortName="UI policy2 short name" longName="UI policy2 long name" />
- <enumeration id="org.eclipse.wst.service.policy.errorWarnEnum"/>
- <enabled multiselect="false"/>
- </operation>
-
- <operation id="service.ui.operation3" defaultdata="false"
- policyPattern="id4" >
- <descriptor shortName="UI policy3 short name" longName="UI policy3 long name" />
- <enumeration id="org.eclipse.wst.service.policy.errorWarnEnum"/>
- </operation>
-
- <operation id="service.ui.operation4" defaultdata="true"
- policyPattern="id1|id2|id3" >
- <descriptor shortName="UI policy4 short name" longName="UI policy4 long name" />
- <enumeration id="org.eclipse.wst.service.policy.errorWarnEnum"/>
- </operation>
-
- <operation id="service.ui.operation5" defaultdata="false"
- policyPattern="id22" workspaceOnly="true">
- <descriptor shortName="UI policy5 short name" longName="UI policy5 long name" />
- <enumeration id="org.eclipse.wst.service.policy.errorWarnEnum2"/>
- </operation>
- <operation id="service.ui.boolean.operation1" defaultdata="false"
- policyPattern="id_bool.*" workspaceOnly="true">
- <descriptor shortName="UI policy2b bool short name" longName="UI policy2b bool long name" />
- <selection/>
- </operation>
-
- <operation id="service.ui.boolean.operation2" defaultdata="true"
- policyPattern="id_boolean2" >
- <descriptor shortName="UI policy3 bool short name" longName="UI policy3 bool long name" />
- <selection icon="true"/>
- </operation>
-
- <operation id="service.ui.complex.operation1" defaultdata="false"
- policyPattern="someparent| id4" >
- <descriptor shortName="UI policy4 short name" longName="UI policy4 long name" />
- <complex launchClass="org.eclipse.wst.ws.service.policy.test.TestLaunchClass"/>
- <enabled multiselect="true"
- enabledClass="org.eclipse.wst.ws.service.policy.test.TestEnabledClass"/>
- </operation>
-
- <quickFix pluginId="org.eclipse.wst.ws.service.policy.test"
- code="1">
- <action class="org.eclipse.wst.ws.service.policy.test.action1">
- <descriptor shortName="quick fix 1 for code 1"/>
- </action>
- <action class="org.eclipse.wst.ws.service.policy.test.action2">
- <descriptor shortName="quick fix 2 for code 1"/>
- </action>
- </quickFix>
-
- <quickFix pluginId="org.eclipse.wst.ws.service.policy.test"
- code="2">
- <action class="org.eclipse.wst.ws.service.policy.test.action3">
- <descriptor shortName="quick fix 1 for code 2"/>
- </action>
- </quickFix>
- </servicePolicyUI>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/MainTester.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/MainTester.java
deleted file mode 100644
index 4bb903b..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/MainTester.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071024 196997 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.service.policy.test;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSISSBPContext;
-import org.eclipse.wst.ws.service.policy.IDescriptor;
-import org.eclipse.wst.ws.service.policy.IPolicyEnumerationList;
-import org.eclipse.wst.ws.service.policy.IPolicyRelationship;
-import org.eclipse.wst.ws.service.policy.IPolicyStateEnum;
-import org.eclipse.wst.ws.service.policy.IServicePolicy;
-import org.eclipse.wst.ws.service.policy.IStateEnumerationItem;
-import org.eclipse.wst.ws.service.policy.ServicePolicyActivator;
-import org.eclipse.wst.ws.service.policy.ServicePolicyPlatform;
-import org.eclipse.wst.ws.service.policy.listeners.IPolicyChildChangeListener;
-
-@SuppressWarnings("restriction") //$NON-NLS-1$
-public class MainTester extends TestCase
-{
-
- public void testExtensions()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- List<IServicePolicy> policyList = platform.getRootServicePolicies( null );
-
- for( IServicePolicy policy : policyList )
- {
- displayPolicyNode( policy );
- }
-
- System.out.println( "" ); //$NON-NLS-1$
- System.out.println("=========== Enumerations:" ); //$NON-NLS-1$
-
- List<IStateEnumerationItem> errorWarnEnum = platform.getStateEnumeration( "org.eclipse.wst.service.policy.errorWarnEnum" ); //$NON-NLS-1$
-
- System.out.println( "Enum id: " + "org.eclipse.wst.service.policy.errorWarnEnum" ); //$NON-NLS-1$ //$NON-NLS-2$
-
- for( IStateEnumerationItem item : errorWarnEnum )
- {
- System.out.println( " id: " + item.getId() ); //$NON-NLS-1$
- System.out.println( " shortname: " + item.getShortName() ); //$NON-NLS-1$
- System.out.println( " longname: " + item.getLongName() ); //$NON-NLS-1$
- System.out.println( " isDefault: " + item.isDefault() ); //$NON-NLS-1$
- System.out.println( "" ); //$NON-NLS-1$
- }
- }
-
- private void displayPolicyNode( IServicePolicy policy )
- {
- IServicePolicy parentPolicy = policy.getParentPolicy();
- IDescriptor descriptor = policy.getDescriptor();
-
- System.out.println( "Found policy: " + policy.getId() + " parentid:" + (parentPolicy == null ? "null" : parentPolicy.getId()) ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- for( IServicePolicy child : policy.getChildren() )
- {
- System.out.println( " child id: " + child.getId() ); //$NON-NLS-1$
- }
-
- List<IPolicyRelationship> relationships = policy.getRelationships();
-
- System.out.println( " relationships:" ); //$NON-NLS-1$
-
- for( IPolicyRelationship relationship : relationships )
- {
- IPolicyEnumerationList sourceList = relationship.getPolicyEnumerationList();
- List<IPolicyEnumerationList> targetList = relationship.getRelatedPolicies();
- List<IStateEnumerationItem> sourceEnumList = sourceList.getEnumerationList();
-
- for( IStateEnumerationItem item : sourceEnumList )
- {
- System.out.println( " " + item.getId() ); //$NON-NLS-1$
- }
-
- for( IPolicyEnumerationList policyEnumList : targetList )
- {
- String policyId = policyEnumList.getPolicy().getId();
- List<IStateEnumerationItem> targetEnumList = policyEnumList.getEnumerationList();
-
- System.out.println( " policy id: " + policyId ); //$NON-NLS-1$
-
- for( IStateEnumerationItem targetItem : targetEnumList )
- {
- System.out.println( " target enum id: " + targetItem.getId() ); //$NON-NLS-1$
- }
- }
- }
-
- System.out.println( "Descriptor:" ); //$NON-NLS-1$
- System.out.println( " short name: " + descriptor.getShortName() ); //$NON-NLS-1$
- System.out.println( " long name: " + descriptor.getLongName() ); //$NON-NLS-1$
- System.out.println( " description: " + descriptor.getDescription() ); //$NON-NLS-1$
- System.out.println( " context help: " + descriptor.getContextHelpId() ); //$NON-NLS-1$
- System.out.println( " icon path: " + descriptor.getIconPath() ); //$NON-NLS-1$
- System.out.println( " icon path bundle id: " + descriptor.getIconBundleId() ); //$NON-NLS-1$
- System.out.println( "===" ); //$NON-NLS-1$
- System.out.println( "" ); //$NON-NLS-1$
-
- for( IServicePolicy child : policy.getChildren() )
- {
- displayPolicyNode( child );
- }
- }
-
- public void testEnumerations()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- IServicePolicy id1 = platform.getServicePolicy( "id1" ); //$NON-NLS-1$
- IServicePolicy id2 = platform.getServicePolicy( "id2" ); //$NON-NLS-1$
- IServicePolicy id3 = platform.getServicePolicy( "id3" ); //$NON-NLS-1$
- IPolicyStateEnum state1 = id1.getPolicyStateEnum();
- IPolicyStateEnum state2 = id2.getPolicyStateEnum();
- IPolicyStateEnum state3 = id3.getPolicyStateEnum();
- IStateEnumerationItem item1 = state1.getCurrentItem();
- IStateEnumerationItem item2 = state2.getCurrentItem();
- IStateEnumerationItem item3 = state3.getCurrentItem();
-
- assertTrue( "Unexpected shortname:" + item1.getShortName(), item1.getShortName().equals( "ignore") ); //$NON-NLS-1$ //$NON-NLS-2$
- assertTrue( "Unexpected shortname:" + item2.getShortName(), item2.getShortName().equals( "warn") ); //$NON-NLS-1$ //$NON-NLS-2$
- assertTrue( "Unexpected shortname:" + item3.getShortName(), item3.getShortName().equals( "error") ); //$NON-NLS-1$ //$NON-NLS-2$
- System.out.println( "id1 value:" + item1.getShortName() ); //$NON-NLS-1$
- System.out.println( "id2 value:" + item2.getShortName() ); //$NON-NLS-1$
- }
-
- public void testPolicyState()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- IServicePolicy id1 = platform.getServicePolicy( "id1" ); //$NON-NLS-1$
- IPolicyStateEnum enumState = id1.getPolicyStateEnum();
- IStateEnumerationItem enumItem = enumState.getCurrentItem();
- String ignoreId = "org.eclipse.wst.ignore"; //$NON-NLS-1$
- String warnId = "org.eclipse.wst.warn"; //$NON-NLS-1$
- String errorId = "org.eclipse.wst.error"; //$NON-NLS-1$
-
- assertTrue( "Default enum not:" + ignoreId, enumItem.getId().equals( ignoreId ) ); //$NON-NLS-1$
-
- enumState.setCurrentItem( warnId );
- enumItem = enumState.getCurrentItem();
-
- assertTrue( "Updated enum not:" + warnId, enumItem.getId().equals( warnId ) ); //$NON-NLS-1$
-
- platform.discardChanges();
- enumItem = enumState.getCurrentItem();
-
- assertTrue( "Discard enum not:" + ignoreId, enumItem.getId().equals( ignoreId ) ); //$NON-NLS-1$
-
- enumState.setCurrentItem( errorId );
- enumItem = enumState.getCurrentItem();
- assertTrue( "Error enum not:" + errorId, enumItem.getId().equals( errorId ) ); //$NON-NLS-1$
-
- platform.commitChanges();
- enumItem = enumState.getCurrentItem();
- assertTrue( "Error enum not:" + errorId, enumItem.getId().equals( errorId ) ); //$NON-NLS-1$
-
- IEclipsePreferences projectPreferences = new InstanceScope().getNode( ServicePolicyActivator.PLUGIN_ID );
-
- try
- {
- String[] keys = projectPreferences.keys();
-
- for( String key : keys )
- {
- System.out.println( "Key=" + key + " value=" + projectPreferences.get( key, "" )); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
- catch( Exception exc )
- {
- assertTrue( "Exception thrown" + exc.getMessage(), false ); //$NON-NLS-1$
- }
- }
-
- public void testUniqueIds()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- IServicePolicy policy = platform.createServicePolicy( null, "someid", null, null ); //$NON-NLS-1$
-
- assertTrue( policy.getId().equals( "someid" ) ); //$NON-NLS-1$
-
- policy = platform.createServicePolicy( null, "someid", null, null ); //$NON-NLS-1$
- assertTrue( policy.getId().equals( "someid1" ) ); //$NON-NLS-1$
-
- policy = platform.createServicePolicy( null, "someid", null, null ); //$NON-NLS-1$
- assertTrue( policy.getId().equals( "someid2" ) ); //$NON-NLS-1$
-
- policy = platform.createServicePolicy( null, "someid1", null, null ); //$NON-NLS-1$
- assertTrue( policy.getId().equals( "someid3" ) ); //$NON-NLS-1$
-
- policy = platform.createServicePolicy( null, "some55id5", null, null ); //$NON-NLS-1$
- assertTrue( policy.getId().equals( "some55id5" ) ); //$NON-NLS-1$
-
- policy = platform.createServicePolicy( null, "some55id5", null, null ); //$NON-NLS-1$
- assertTrue( policy.getId().equals( "some55id1" ) ); //$NON-NLS-1$
- }
-
-
- @SuppressWarnings("restriction") //$NON-NLS-1$
- public void testOldWSIContext()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- IServicePolicy apPolicy = platform.getServicePolicy( "org.eclipse.wst.ws.service.policy.ui.servicepols.wsiprofilecomp.wsiap" ); //$NON-NLS-1$
- IPolicyStateEnum apState = apPolicy.getPolicyStateEnum();
- IServicePolicy ssbpPolicy = platform.getServicePolicy( "org.eclipse.wst.ws.service.policy.ui.servicepols.wsiprofilecomp.wsissbp" ); //$NON-NLS-1$
- PersistentWSIAPContext apContext = new PersistentWSIAPContext();
- PersistentWSISSBPContext ssbpContext = new PersistentWSISSBPContext();
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject project = root.getProject("TestProject"); //$NON-NLS-1$
- String item = null;
-
- try
- {
- project.create(new NullProgressMonitor());
- }
- catch( CoreException exc )
- {
- assertTrue( "Core exception:" + exc.getMessage(), false ); //$NON-NLS-1$
- }
-
- IPolicyStateEnum apProjState = apPolicy.getPolicyStateEnum( project );
- IPolicyStateEnum ssbpProjState = ssbpPolicy.getPolicyStateEnum( project );
-
- // Ensure that project preferences are gotten from the workspace
- apState.setCurrentItem( "org.eclipse.wst.sug.ignore" ); //$NON-NLS-1$
- platform.commitChanges();
- apProjState.setCurrentItem( "org.eclipse.wst.sug.suggest" ); //$NON-NLS-1$
- item = apProjState.getCurrentItem().getId();
- assertTrue( "Ap value not ignore, but got " + item, item.equals("org.eclipse.wst.sug.ignore")); //$NON-NLS-1$ //$NON-NLS-2$
-
- apState.setCurrentItem( "org.eclipse.wst.sug.require" ); //$NON-NLS-1$
- platform.commitChanges();
- apProjState.setCurrentItem( "org.eclipse.wst.sug.ignore" ); //$NON-NLS-1$
- item = apProjState.getCurrentItem().getId();
- assertTrue( "Ap value not require, but got " + item, item.equals("org.eclipse.wst.sug.require")); //$NON-NLS-1$ //$NON-NLS-2$
-
- platform.setProjectPreferencesEnabled( project , true );
- item = apProjState.getCurrentItem().getId();
- assertTrue( "Ap value not ingore, but got " + item, item.equals("org.eclipse.wst.sug.ignore")); //$NON-NLS-1$ //$NON-NLS-2$
-
- platform.commitChanges( project );
- item = apProjState.getCurrentItem().getId();
- assertTrue( "Ap value not ingore, but got " + item, item.equals("org.eclipse.wst.sug.ignore")); //$NON-NLS-1$ //$NON-NLS-2$
-
- String apContextValue = apContext.getProjectWSICompliance( project );
- assertTrue( "Ap context not ignore, but " + apContextValue, apContextValue.equals( PersistentWSIContext.IGNORE_NON_WSI ) ); //$NON-NLS-1$
-
- apState.setCurrentItem( "org.eclipse.wst.sug.suggest" ); //$NON-NLS-1$
- platform.commitChanges();
- apContextValue = apContext.getProjectWSICompliance( project );
- assertTrue( "Ap context not ignore, but " + apContextValue, apContextValue.equals( PersistentWSIContext.IGNORE_NON_WSI ) ); //$NON-NLS-1$
-
- platform.setProjectPreferencesEnabled( project, false );
- apContextValue = apContext.getProjectWSICompliance( project );
- assertTrue( "Ap context not ignore, but " + apContextValue, apContextValue.equals( PersistentWSIContext.WARN_NON_WSI ) ); //$NON-NLS-1$
-
- apProjState.setCurrentItem( "org.eclipse.wst.sug.require" ); //$NON-NLS-1$
- platform.commitChanges( project );
- apContextValue = apContext.getProjectWSICompliance( project );
- assertTrue( "Ap context not suggest, but " + apContextValue, apContextValue.equals( PersistentWSIContext.WARN_NON_WSI ) ); //$NON-NLS-1$
-
- platform.setProjectPreferencesEnabled( project, true );
- apContextValue = apContext.getProjectWSICompliance( project );
- assertTrue( "Ap context not require, but " + apContextValue, apContextValue.equals( PersistentWSIContext.STOP_NON_WSI ) ); //$NON-NLS-1$
-
- ssbpProjState.setCurrentItem( "org.eclipse.wst.sug.suggest" ); //$NON-NLS-1$
-
- String ssbpContextValue = ssbpContext.getProjectWSICompliance( project );
-
- assertTrue( "Ap context not require, but " + apContextValue, apContextValue.equals( PersistentWSIContext.STOP_NON_WSI ) ); //$NON-NLS-1$
- assertTrue( "SSBP context not suggest, but " + ssbpContextValue, ssbpContextValue.equals( PersistentWSIContext.WARN_NON_WSI ) ); //$NON-NLS-1$
-
- ssbpProjState.setCurrentItem( "org.eclipse.wst.sug.require" ); //$NON-NLS-1$
-
- ssbpContextValue = ssbpContext.getProjectWSICompliance( project );
- assertTrue( "Ap context not require, but " + apContextValue, apContextValue.equals( PersistentWSIContext.STOP_NON_WSI ) ); //$NON-NLS-1$
- assertTrue( "SSBP context not require, but " + ssbpContextValue, ssbpContextValue.equals( PersistentWSIContext.STOP_NON_WSI ) ); //$NON-NLS-1$
-
- }
-
- public void testMutable()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- IServicePolicy apPolicy = platform.getServicePolicy( "org.eclipse.wst.ws.service.policy.ui.servicepols.wsiprofilecomp.wsiap" ); //$NON-NLS-1$
- IServicePolicy ssbpPolicy = platform.getServicePolicy( "org.eclipse.wst.ws.service.policy.ui.servicepols.wsiprofilecomp.wsissbp" ); //$NON-NLS-1$
- IServicePolicy wsiPolicy = platform.getServicePolicy( "org.eclipse.wst.ws.service.policy.ui.servicepols.wsiprofilecomp" ); //$NON-NLS-1$
-
- assertTrue( "Root wsi policy is mutable", !wsiPolicy.getPolicyState().isMutable() ); //$NON-NLS-1$
- assertTrue( "Ap policy is not mutable", apPolicy.getPolicyState().isMutable() ); //$NON-NLS-1$
- assertTrue( "SSBP policy is not mutable", ssbpPolicy.getPolicyState().isMutable() ); //$NON-NLS-1$
- }
-
- public void testChildChangeListeners()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- ChildChangeListener listener = new ChildChangeListener();
-
- platform.addChildChangeListener(listener, false );
- listener.childEventOccured = false;
- listener.isAdded = false;
-
- IServicePolicy parent = platform.createServicePolicy( null, "parent_id1", null, null );
-
- assertTrue( "Listener not called", listener.childEventOccured );
- assertTrue( "Listener not added", listener.isAdded );
-
- listener.childEventOccured = false;
- listener.isAdded = false;
- IServicePolicy child1 = platform.createServicePolicy( parent, "parent_id1", null, null );
-
- assertTrue( "Listener not called", listener.childEventOccured );
- assertTrue( "Listener not added", listener.isAdded );
-
- listener.childEventOccured = false;
- listener.isAdded = false;
- listener.count = 0;
- IServicePolicy child2 = platform.createServicePolicy( child1, "parent_id1", null, null );
- IServicePolicy child3 = platform.createServicePolicy( child2, "parent_id1", null, null );
-
- assertTrue( "Listener not called", listener.childEventOccured );
- assertTrue( "Listener not added", listener.isAdded );
- assertTrue( "Listener count not 2", listener.count == 2 );
-
- listener.childEventOccured = false;
- listener.isAdded = true;
- listener.count = 0;
-
- child2.removeChild( child3 );
-
- assertTrue( "Listener not called", listener.childEventOccured );
- assertTrue( "Listener not removed", !listener.isAdded );
- assertTrue( "Listener count not 1", listener.count == 1 );
-
- listener.childEventOccured = false;
- listener.isAdded = true;
- listener.count = 0;
-
- // Should remove parent, child1, and child2
- platform.removeServicePolicy( parent );
-
- assertTrue( "Listener not called", listener.childEventOccured );
- assertTrue( "Listener not removed", !listener.isAdded );
- assertTrue( "Listener count not 3", listener.count == 3 );
-
- platform.removeChildChangeListener( listener, false );
-
- listener.childEventOccured = false;
- listener.isAdded = true;
- listener.count = 0;
-
- parent = platform.createServicePolicy( null, "parent_id1", null, null );
- child1 = platform.createServicePolicy( parent, "parent_id1", null, null );
-
- assertTrue( "Listener called", !listener.childEventOccured );
- assertTrue( "Listener isadded changed", listener.isAdded );
- assertTrue( "Listener count not 0", listener.count == 0 );
- }
-
- public void testState()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- IServicePolicy id2 = platform.getServicePolicy( "id2" );
- String value = id2.getPolicyState().getValue( "id2_key" );
-
- assertTrue( "Expected state value to be id2_value.", value.equals( "id2_value" ) );
- }
-
- private class ChildChangeListener implements IPolicyChildChangeListener
- {
- public boolean childEventOccured = false;
- public boolean isAdded = false;
- public int count = 0;;
-
- public void childChange(List<IServicePolicy> childList, List<Boolean> addedList)
- {
- childEventOccured = true;
- isAdded = addedList.get(0);
- count++;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/MainUITester.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/MainUITester.java
deleted file mode 100644
index 7bae559..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/MainUITester.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071024 196997 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.service.policy.test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.ws.service.policy.IDescriptor;
-import org.eclipse.wst.ws.service.policy.IFilter;
-import org.eclipse.wst.ws.service.policy.IServicePolicy;
-import org.eclipse.wst.ws.service.policy.ServicePolicyPlatform;
-import org.eclipse.wst.ws.service.policy.ui.IPolicyOperation;
-import org.eclipse.wst.ws.service.policy.ui.IQuickFixAction;
-import org.eclipse.wst.ws.service.policy.ui.IQuickFixActionInfo;
-import org.eclipse.wst.ws.service.policy.ui.ServicePolicyPlatformUI;
-import org.eclipse.wst.ws.service.policy.ui.utils.ActivityUtils;
-
-public class MainUITester extends TestCase
-{
-
- public void testExtensions()
- {
- ServicePolicyPlatformUI platformUI = ServicePolicyPlatformUI.getInstance();
- List<IPolicyOperation> operations = platformUI.getAllOperations();
-
- for( IPolicyOperation operation : operations )
- {
- displayOperation( operation );
- }
- }
-
- public void testOperationCache()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- ServicePolicyPlatformUI platformUI = ServicePolicyPlatformUI.getInstance();
- IServicePolicy id1 = platform.getServicePolicy( "id1" ); //$NON-NLS-1$
- IServicePolicy id2 = platform.getServicePolicy( "id2" ); //$NON-NLS-1$
- IServicePolicy id3 = platform.getServicePolicy( "id3" ); //$NON-NLS-1$
- IServicePolicy id4 = platform.getServicePolicy( "id4" ); //$NON-NLS-1$
- IPolicyOperation op1_id2 = platformUI.getOperation( id2, "service.ui.operation1" ); //$NON-NLS-1$
- IPolicyOperation op1_id3 = platformUI.getOperation( id3, "service.ui.operation1" ); //$NON-NLS-1$
- IPolicyOperation op2_id1 = platformUI.getOperation( id1, "service.ui.operation2" ); //$NON-NLS-1$
- IPolicyOperation op2_id2 = platformUI.getOperation( id2, "service.ui.operation2" ); //$NON-NLS-1$
- IPolicyOperation op2_id3 = platformUI.getOperation( id3, "service.ui.operation2" ); //$NON-NLS-1$
- IPolicyOperation op2_id4 = platformUI.getOperation( id4, "service.ui.operation2" ); //$NON-NLS-1$
- IPolicyOperation op3_id4 = platformUI.getOperation( id4, "service.ui.operation3" ); //$NON-NLS-1$
- IPolicyOperation op4_id1 = platformUI.getOperation( id1, "service.ui.operation4" ); //$NON-NLS-1$
- IPolicyOperation op4_id2 = platformUI.getOperation( id2, "service.ui.operation4" ); //$NON-NLS-1$
- IPolicyOperation op4_id3 = platformUI.getOperation( id3, "service.ui.operation4" ); //$NON-NLS-1$
-
- List<IPolicyOperation> list1 = platformUI.getOperations( id1, true );
- List<IPolicyOperation> list2 = platformUI.getOperations( id2, true );
- List<IPolicyOperation> list3 = platformUI.getOperations( id3, true );
- List<IPolicyOperation> list4 = platformUI.getOperations( id4, true );
-
- System.out.println( "\nDisplay lists" ); //$NON-NLS-1$
- displayList( "List1", list1 ); //$NON-NLS-1$
- displayList( "List2", list2 ); //$NON-NLS-1$
- displayList( "List3", list3 ); //$NON-NLS-1$
- displayList( "List4", list4 ); //$NON-NLS-1$
-
- checkContents( "List1", list1, new IPolicyOperation[]{ op2_id1, op4_id1 } ); //$NON-NLS-1$
- checkContents( "List2", list2, new IPolicyOperation[]{ op1_id2, op2_id2, op4_id2 } ); //$NON-NLS-1$
- checkContents( "List3", list3, new IPolicyOperation[]{ op1_id3, op2_id3, op4_id3 } ); //$NON-NLS-1$
- checkContents( "List4", list4, new IPolicyOperation[]{ op2_id4, op3_id4 } ); //$NON-NLS-1$
- }
-
- public void testEnabledOperations()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- ServicePolicyPlatformUI platformUI = ServicePolicyPlatformUI.getInstance();
- IServicePolicy id1 = platform.getServicePolicy( "id1" ); //$NON-NLS-1$
- IServicePolicy id2 = platform.getServicePolicy( "id2" ); //$NON-NLS-1$
- IServicePolicy id3 = platform.getServicePolicy( "id3" ); //$NON-NLS-1$
- IServicePolicy id4 = platform.getServicePolicy( "id4" ); //$NON-NLS-1$
- List<IServicePolicy> policyList1 = new Vector<IServicePolicy>();
- List<IServicePolicy> policyList2 = new Vector<IServicePolicy>();
- IPolicyOperation op1 = platformUI.getOperation( id4, "service.ui.operation3" ); //$NON-NLS-1$
-
- policyList1.add( id1 );
- policyList1.add( id2 );
- policyList1.add( id3 );
- policyList1.add( id4 );
- policyList2.add( id4 );
-
- assertTrue( "Expected operation to not be enabled", !op1.isEnabled( policyList1 ) ); //$NON-NLS-1$
- assertTrue( "Expected operation to be enabled", op1.isEnabled( policyList2 ) ); //$NON-NLS-1$
- }
-
- public void testQuickFixActions()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- ServicePolicyPlatformUI platformUI = ServicePolicyPlatformUI.getInstance();
- IServicePolicy id1 = platform.getServicePolicy( "id1" ); //$NON-NLS-1$
- IStatus status1 = new Status( IStatus.ERROR, "org.eclipse.wst.ws.service.policy.test", 1, "some error", null ); //$NON-NLS-1$ //$NON-NLS-2$
- IStatus status2 = new Status( IStatus.ERROR, "org.eclipse.wst.ws.service.policy.test", 2, "some error", null ); //$NON-NLS-1$ //$NON-NLS-2$
- List<IQuickFixActionInfo> fixList1 = platformUI.getQuickFixes( status1 );
- List<IQuickFixActionInfo> fixList2 = platformUI.getQuickFixes( status2 );
-
- assertTrue( "Expecting two quick fixes", fixList1.size() == 2 ); //$NON-NLS-1$
- assertTrue( "Expection one quick fix", fixList2.size() == 1 ); //$NON-NLS-1$
-
- for( IQuickFixActionInfo actionInfo : fixList1 )
- {
- IQuickFixAction action = actionInfo.getAction();
- id1.setStatus( status1 );
-
- assertTrue( "Status is not OK", !id1.getStatus().isOK() ); //$NON-NLS-1$
- action.action( id1 );
- assertTrue( "Status is Ok ", id1.getStatus().isOK() ); //$NON-NLS-1$
- }
-
- for( IQuickFixActionInfo actionInfo : fixList2 )
- {
- IQuickFixAction action = actionInfo.getAction();
- id1.setStatus( status2 );
-
- assertTrue( "Status is not OK", !id1.getStatus().isOK() ); //$NON-NLS-1$
- action.action( id1 );
- assertTrue( "Status is Ok ", id1.getStatus().isOK() ); //$NON-NLS-1$
- }
- }
-
- public void testActivitiesFilter()
- {
- IFilter activitiesFilter = ActivityUtils.getCurrentActivitiesFilter();
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- List<IServicePolicy> policyList = platform.getRootServicePolicies( activitiesFilter );
-
- displayPolicies( policyList );
- }
-
- @SuppressWarnings("unchecked")
- public void testGetOperationsList()
- {
- ServicePolicyPlatform platform = ServicePolicyPlatform.getInstance();
- ServicePolicyPlatformUI platformUI = ServicePolicyPlatformUI.getInstance();
- IServicePolicy id1 = platform.getServicePolicy( "id1" ); //$NON-NLS-1$
- IServicePolicy id2 = platform.getServicePolicy( "id2" ); //$NON-NLS-1$
- IServicePolicy id3 = platform.getServicePolicy( "id3" ); //$NON-NLS-1$
- IServicePolicy id4 = platform.getServicePolicy( "id4" ); //$NON-NLS-1$
- IPolicyOperation op1_id2 = platformUI.getOperation( id2, "service.ui.operation1" ); //$NON-NLS-1$
- IPolicyOperation op1_id3 = platformUI.getOperation( id3, "service.ui.operation1" ); //$NON-NLS-1$
- IPolicyOperation op2_id1 = platformUI.getOperation( id1, "service.ui.operation2" ); //$NON-NLS-1$
- IPolicyOperation op2_id2 = platformUI.getOperation( id2, "service.ui.operation2" ); //$NON-NLS-1$
- IPolicyOperation op2_id3 = platformUI.getOperation( id3, "service.ui.operation2" ); //$NON-NLS-1$
- IPolicyOperation op2_id4 = platformUI.getOperation( id4, "service.ui.operation2" ); //$NON-NLS-1$
- IPolicyOperation op3_id4 = platformUI.getOperation( id4, "service.ui.operation3" ); //$NON-NLS-1$
- IPolicyOperation op4_id1 = platformUI.getOperation( id1, "service.ui.operation4" ); //$NON-NLS-1$
- IPolicyOperation op4_id2 = platformUI.getOperation( id2, "service.ui.operation4" ); //$NON-NLS-1$
- IPolicyOperation op4_id3 = platformUI.getOperation( id3, "service.ui.operation4" ); //$NON-NLS-1$
- List<IServicePolicy> idList1 = null;
- List<IServicePolicy> idList2 = null;
- List<IServicePolicy> idList3 = null;
- List<IServicePolicy> idList4 = null;
-
- List<List<IPolicyOperation>> checkList1 = null;
- List<List<IPolicyOperation>> checkList2 = null;
- List<List<IPolicyOperation>> checkList3 = null;
- List<List<IPolicyOperation>> checkList4 = null;
-
- checkList1 = ll( l(op2_id1), l(op4_id1) );
- checkList2 = ll( l(op1_id2), l(op2_id1, op2_id2), l(op4_id1, op4_id2) );
- checkList3 = ll( l(op1_id2, op1_id3), l(op2_id1, op2_id2, op2_id3), l(op4_id1, op4_id2, op4_id3) );
- checkList4 = ll( l(op1_id2, op1_id3), l(op2_id1, op2_id2, op2_id3, op2_id4), l(op3_id4), l(op4_id1, op4_id2, op4_id3) );
-
- idList1 = Arrays.asList( new IServicePolicy[]{ id1 } );
- idList2 = Arrays.asList( new IServicePolicy[]{ id1, id2 } );
- idList3 = Arrays.asList( new IServicePolicy[]{ id1, id2, id3 } );
- idList4 = Arrays.asList( new IServicePolicy[]{ id1, id2, id3, id4 } );
-
- List<List<IPolicyOperation>> opList1 = platformUI.getOperationsList( idList1, true );
- List<List<IPolicyOperation>> opList2 = platformUI.getOperationsList( idList2, true );
- List<List<IPolicyOperation>> opList3 = platformUI.getOperationsList( idList3, true );
- List<List<IPolicyOperation>> opList4 = platformUI.getOperationsList( idList4, true );
-
- verifyLists( "List1", opList1, checkList1 );
- verifyLists( "List2", opList2, checkList2 );
- verifyLists( "List3", opList3, checkList3 );
- verifyLists( "List4", opList4, checkList4 );
- }
-
- private List<List<IPolicyOperation>> ll( List<IPolicyOperation>... opList )
- {
- return Arrays.asList( opList );
- }
-
- private List<IPolicyOperation> l( IPolicyOperation... opList )
- {
- return Arrays.asList( opList );
- }
-
- private void verifyLists( String listName, List<List<IPolicyOperation>> list1, List<List<IPolicyOperation>> list2 )
- {
- assertTrue( listName + " does not have the same size.", list1.size() == list2.size() );
-
- for( int listIndex = 0 ; listIndex < list1.size(); listIndex++ )
- {
- List<IPolicyOperation> policyList1 = list1.get( listIndex );
- List<IPolicyOperation> policyList2 = findList( policyList1.get(0).getId(), list2 );
-
- assertTrue( listName + " nested list at index " + listIndex + " is not the same size.", policyList1.size() == policyList2.size() );
-
- for( int index = 0; index < policyList1.size(); index++ )
- {
- IPolicyOperation op1 = policyList1.get( index );
-
- assertTrue( listName + " operation not found", findOp( op1, policyList2 ) );
- }
- }
- }
-
- private boolean findOp( IPolicyOperation op, List<IPolicyOperation> list )
- {
- boolean result = false;
-
- for( IPolicyOperation foundOp : list )
- {
- if( op == foundOp )
- {
- result = true;
- break;
- }
- }
-
- return result;
- }
-
- private List<IPolicyOperation> findList( String id, List<List<IPolicyOperation>> searchList )
- {
- for( List<IPolicyOperation> policyList : searchList )
- {
- if( policyList.get(0).getId().equals( id ) )
- {
- return policyList;
- }
- }
-
- assertTrue( "List not found for id" + id, false );
- return null;
- }
-
- private void displayPolicies( List<IServicePolicy> policyList )
- {
- System.out.println( "Listing service policies:" );
- for( IServicePolicy policy : policyList )
- {
- System.out.println( " " + policy.getId() );
- }
- }
-
- private void displayList( String setName, List<IPolicyOperation> operationList )
- {
- System.out.print( setName + ": " ); //$NON-NLS-1$
-
- for( IPolicyOperation operation : operationList )
- {
- System.out.print( operation.getId() + "," ); //$NON-NLS-1$
- }
-
- System.out.println( "" ); //$NON-NLS-1$
- }
-
- private void checkContents( String setName, List<IPolicyOperation> operationSet, IPolicyOperation[] operationArray )
- {
- assertTrue( "Set and array sizes don't match for " + setName + ".", operationSet.size() == operationArray.length ); //$NON-NLS-1$ //$NON-NLS-2$
-
- for( IPolicyOperation operation : operationArray )
- {
- assertTrue( setName + " does not contain operation " + operation.getId() + ".", operationSet.contains( operation ) ); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- private void displayOperation( IPolicyOperation operation )
- {
- List<IServicePolicy> zeroPolicies = new Vector<IServicePolicy>();
- List<IServicePolicy> manyPolicies = ServicePolicyPlatform.getInstance().getRootServicePolicies( null );
- IDescriptor descriptor = operation.getDescriptor();
- String shortName = descriptor.getShortName();
- String longName = descriptor.getLongName();
-
- System.out.println( "Operation id: " + operation.getId() ); //$NON-NLS-1$
- System.out.println( " short name: " + shortName ); //$NON-NLS-1$
- System.out.println( " long name: " + longName ); //$NON-NLS-1$
- System.out.println( " pattern: " + operation.getPolicyIdPattern() ); //$NON-NLS-1$
- System.out.println( " isEnabled zero: " + operation.isEnabled( zeroPolicies ) ); //$NON-NLS-1$
- System.out.println( " isEnabled many: " + operation.isEnabled( manyPolicies ) ); //$NON-NLS-1$
-
- switch( operation.getOperationKind() )
- {
- case selection:
- {
- System.out.println( " selection: true" ); //$NON-NLS-1$
- break;
- }
-
- case iconSelection:
- {
- System.out.println( " selection icon: true" ); //$NON-NLS-1$
- break;
- }
-
- case enumeration:
- {
- System.out.println( " enumeration id: " + operation.getEnumerationId() ); //$NON-NLS-1$
- break;
- }
-
- case complex:
- {
- System.out.println( " complex: true" ); //$NON-NLS-1$
- operation.launchOperation( zeroPolicies );
- break;
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/ServicePolicytTestActivator.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/ServicePolicytTestActivator.java
deleted file mode 100644
index c6afcd0..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/ServicePolicytTestActivator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071024 196997 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.service.policy.test;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.IStartup;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ServicePolicytTestActivator extends Plugin implements IStartup {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.service.policy.test"; //$NON-NLS-1$
-
- // The shared instance
- private static ServicePolicytTestActivator plugin;
-
- /**
- * The constructor
- */
- public ServicePolicytTestActivator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static ServicePolicytTestActivator getDefault() {
- return plugin;
- }
-
- public static void logError( String message, Throwable exc )
- {
- IStatus status = new Status( IStatus.ERROR, PLUGIN_ID, 0, message, exc );
-
- getDefault().getLog().log(status);
- }
-
- public void earlyStartup()
- {
- // DO nothing. All we want to do is get the plugin loaded at UI start time.
- }
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/TestEnabledClass.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/TestEnabledClass.java
deleted file mode 100644
index 4bb8d33..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/TestEnabledClass.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071024 196997 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.service.policy.test;
-
-import java.util.List;
-
-import org.eclipse.wst.ws.service.policy.IServicePolicy;
-import org.eclipse.wst.ws.service.policy.ui.IEnableOperation;
-
-public class TestEnabledClass implements IEnableOperation
-{
-
- public boolean isEnabled(List<IServicePolicy> selectedPolicies)
- {
- System.out.println( " Is enabled operation called." ); //$NON-NLS-1$
- return true;
- }
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/TestLaunchClass.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/TestLaunchClass.java
deleted file mode 100644
index 77945b0..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/TestLaunchClass.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071024 196997 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.service.policy.test;
-
-import java.util.List;
-
-import org.eclipse.wst.ws.service.policy.IServicePolicy;
-import org.eclipse.wst.ws.service.policy.ui.ILaunchOperation;
-
-public class TestLaunchClass implements ILaunchOperation
-{
-
- public void launch(List<IServicePolicy> selectedPolicies)
- {
- System.out.println( " Launch class called." ); //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action1.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action1.java
deleted file mode 100644
index d4c34ad..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071120 196997 pmoogk@ca.ibm.com - Peter Moogk, Initial coding.
- *******************************************************************************/
-package org.eclipse.wst.ws.service.policy.test;
-
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.ws.service.policy.IServicePolicy;
-import org.eclipse.wst.ws.service.policy.ui.IQuickFixAction;
-
-public class action1 implements IQuickFixAction
-{
-
- public void action(IServicePolicy policy)
- {
- policy.setStatus( Status.OK_STATUS );
- }
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action2.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action2.java
deleted file mode 100644
index f93e858..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071120 196997 pmoogk@ca.ibm.com - Peter Moogk, Initial coding.
- *******************************************************************************/
-package org.eclipse.wst.ws.service.policy.test;
-
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.ws.service.policy.IServicePolicy;
-import org.eclipse.wst.ws.service.policy.ui.IQuickFixAction;
-
-public class action2 implements IQuickFixAction
-{
-
- public void action(IServicePolicy policy)
- {
- policy.setStatus( Status.OK_STATUS );
- }
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action3.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action3.java
deleted file mode 100644
index 84d977d..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action3.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071120 196997 pmoogk@ca.ibm.com - Peter Moogk, Initial coding.
- *******************************************************************************/
-package org.eclipse.wst.ws.service.policy.test;
-
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.ws.service.policy.IServicePolicy;
-import org.eclipse.wst.ws.service.policy.ui.IQuickFixAction;
-
-public class action3 implements IQuickFixAction
-{
-
- public void action(IServicePolicy policy)
- {
- policy.setStatus( Status.OK_STATUS );
- }
-}
diff --git a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/internal/properties/FOOFilePropertyTester.java b/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/internal/properties/FOOFilePropertyTester.java
deleted file mode 100644
index b983ea7..0000000
--- a/tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/internal/properties/FOOFilePropertyTester.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.wst.ws.service.policy.test.internal.properties;
-
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-public class FOOFilePropertyTester extends PropertyTester
-{
- public boolean test(Object receiver, String property, Object[] args, Object expectedValue)
- {
- boolean result = false;
-
- if( receiver instanceof IContainer)
- {
- result = hasFOOfile( (IContainer) receiver );
- }
-
- return result;
- }
-
- private boolean hasFOOfile( IContainer container )
- {
- boolean result = false;
-
- try
- {
- IResource[] children = container.members();
-
- for( IResource child : children )
- {
- if( child instanceof IContainer )
- {
- result = hasFOOfile( (IContainer) child );
-
- }
- else if( child instanceof IFile )
- {
- result = child.getFileExtension().equalsIgnoreCase( "foo" );
- }
-
- // If we found a single foo file we will break out of the loop.
- if( result ) break;
- }
- }
- catch( CoreException exc )
- {
- // Ignore exception and return false.
- }
-
- return result;
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/.classpath b/tests/org.eclipse.wst.ws.tests/.classpath
deleted file mode 100644
index f2898cc..0000000
--- a/tests/org.eclipse.wst.ws.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.ws.tests/.cvsignore b/tests/org.eclipse.wst.ws.tests/.cvsignore
deleted file mode 100644
index 67968bd..0000000
--- a/tests/org.eclipse.wst.ws.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
-javaCompiler.tests.jar.args
diff --git a/tests/org.eclipse.wst.ws.tests/.project b/tests/org.eclipse.wst.ws.tests/.project
deleted file mode 100644
index 55f2bcd..0000000
--- a/tests/org.eclipse.wst.ws.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0fd1048..0000000
--- a/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:29:14 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 9e87a8a..0000000
--- a/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Mon Apr 24 10:27:54 EDT 2006
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 401dd7a..0000000
--- a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.tests; singleton:=true
-Bundle-Version: 1.0.301.qualifier
-Bundle-Activator: org.eclipse.wst.ws.tests.plugin.TestsPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.wst.ws,
- org.eclipse.core.runtime,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.jem.util,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws.ui,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.common.environment,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.wst.ws.test.popup,
- org.eclipse.wst.ws.tests.data,
- org.eclipse.wst.ws.tests.plugin,
- org.eclipse.wst.ws.tests.unittest,
- org.eclipse.wst.ws.tests.utils
-Bundle-ClassPath: tests.jar
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-
diff --git a/tests/org.eclipse.wst.ws.tests/about.html b/tests/org.eclipse.wst.ws.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.ws.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.ws.tests/build.properties b/tests/org.eclipse.wst.ws.tests/build.properties
deleted file mode 100644
index 731b926..0000000
--- a/tests/org.eclipse.wst.ws.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = data/,\
- plugin.xml,\
- readme.txt,\
- tests.jar,\
- META-INF/,\
- test.xml,\
- about.html,\
- plugin.properties
-jars.compile.order = tests.jar
-source.tests.jar = tests/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl b/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl
deleted file mode 100644
index 0bd31ca..0000000
--- a/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/AreaService/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="AreaService" targetNamespace="http://tempuri.org/AreaService/">
- <wsdl:types>
- <xsd:schema targetNamespace="http://tempuri.org/AreaService/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="area" type="xsd:float"/>
- <xsd:element name="parameters" type="tns:dimensions"/>
- <xsd:complexType name="dimensions">
- <xsd:sequence>
- <xsd:element name="width" type="xsd:float"></xsd:element>
- <xsd:element name="height" type="xsd:float"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="CalculateRectAreaResponse">
- <wsdl:part element="tns:area" name="area"/>
- </wsdl:message>
- <wsdl:message name="CalculateRectAreaRequest">
- <wsdl:part element="tns:parameters" name="parameters"/>
- </wsdl:message>
- <wsdl:portType name="AreaService">
- <wsdl:operation name="CalculateRectArea">
- <wsdl:input message="tns:CalculateRectAreaRequest"/>
- <wsdl:output message="tns:CalculateRectAreaResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="AreaServiceSOAP" type="tns:AreaService">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="CalculateRectArea">
- <soap:operation soapAction="http://tempuri.org/AreaService/NewOperation"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="AreaService">
- <wsdl:port binding="tns:AreaServiceSOAP" name="AreaServiceSOAP">
- <soap:address location="http://tempuri.org"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2/3/test.wsdl b/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2/3/test.wsdl
deleted file mode 100644
index 88d62b9..0000000
--- a/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2/3/test.wsdl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:test="http://www.example.org/test/"
- targetNamespace="http://www.example.org/test/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:txsd="http://www.example.org/testxsd"
- xmlns:txsd2="http://www.example.org/testxsd2">
-
- <wsdl:types>
- <schema xmlns="http://www.w3.org/2001/XMLSchema">
- <import namespace="http://www.example.org/testxsd2"
- schemaLocation="../../2a/test.xsd" />
- <import namespace="http://www.example.org/testxsd"
- schemaLocation="../../../test.xsd" />
- </schema>
- </wsdl:types>
- <wsdl:message name="NewOperationRequest">
- <wsdl:part name="input" element="txsd:TestString"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="NewOperationResponse">
- <wsdl:part name="output" element="txsd2:TestString2"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="TestPortType">
- <wsdl:operation name="NewOperation">
- <wsdl:input message="test:NewOperationRequest"></wsdl:input>
- <wsdl:output message="test:NewOperationResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="NewBinding" type="test:TestPortType">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="NewOperation">
- <soap:operation
- soapAction="http://www.example.org/test/NewOperation" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2a/start.wsdl b/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2a/start.wsdl
deleted file mode 100644
index 1f627bb..0000000
--- a/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2a/start.wsdl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions
- targetNamespace="http://www.example.org/start/"
- xmlns:test="http://www.example.org/test/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <wsdl:import location="../2/3/test.wsdl" namespace="http://www.example.org/test/"/>
-
- <wsdl:types>
- <schema xmlns="http://www.w3.org/2001/XMLSchema">
- <import namespace="http://www.example.org/testxsd"
- schemaLocation="../../test.xsd" />
- </schema>
- </wsdl:types>
-
- <wsdl:service name="Start">
- <wsdl:port name="NewPort" binding="test:NewBinding">
- <soap:address location="http://www.example.org/"></soap:address>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2a/test.xsd b/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2a/test.xsd
deleted file mode 100644
index b26ffe0..0000000
--- a/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2a/test.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema
- xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/testxsd2"
- elementFormDefault="qualified">
- <element name="TestString2" type="string"></element>
-</schema>
diff --git a/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/test.xsd b/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/test.xsd
deleted file mode 100644
index a1e646f..0000000
--- a/tests/org.eclipse.wst.ws.tests/data/wsdlcopier/test.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema
- xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/testxsd"
- elementFormDefault="qualified">
- <element name="TestString" type="string"></element>
-</schema>
diff --git a/tests/org.eclipse.wst.ws.tests/icons/full/wizban/webservices_wiz.png b/tests/org.eclipse.wst.ws.tests/icons/full/wizban/webservices_wiz.png
deleted file mode 100644
index 8520fb5..0000000
--- a/tests/org.eclipse.wst.ws.tests/icons/full/wizban/webservices_wiz.png
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.ws.tests/plugin.properties b/tests/org.eclipse.wst.ws.tests/plugin.properties
deleted file mode 100644
index 2933ec1..0000000
--- a/tests/org.eclipse.wst.ws.tests/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060424 138060 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=WST Web Services Test
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/tests/org.eclipse.wst.ws.tests/plugin.xml b/tests/org.eclipse.wst.ws.tests/plugin.xml
deleted file mode 100644
index 8d529a9..0000000
--- a/tests/org.eclipse.wst.ws.tests/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- id="org.eclipse.wst.ws.test.popup.contribution1">
- <menu
- label="Popup test menu"
- path="additions"
- id="org.eclipse.wst.ws.test.popup.menu1">
- <separator
- name="group1">
- </separator>
- </menu>
- <action
- label="Popup test action"
- class="org.eclipse.wst.ws.test.popup.NewAction"
- menubarPath="org.eclipse.wst.ws.test.popup.menu1/group1"
- enablesFor="1"
- id="org.eclipse.wst.ws.test.popup.newAction">
- </action>
- </objectContribution>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.ws.tests/readme.txt b/tests/org.eclipse.wst.ws.tests/readme.txt
deleted file mode 100644
index 91de037..0000000
--- a/tests/org.eclipse.wst.ws.tests/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Currently no arguments to be passed in. See org.eclipse.jst.ws.tests for adding
-arguments when running test suite (i.e. server install location...)
diff --git a/tests/org.eclipse.wst.ws.tests/test.xml b/tests/org.eclipse.wst.ws.tests/test.xml
deleted file mode 100644
index f291ace..0000000
--- a/tests/org.eclipse.wst.ws.tests/test.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.ws.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <!-- commented for now until such a time as we need to call a server for wst tests -->
- <!--<property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> -->
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-ws-folder" value="${eclipse-home}/wst_ws_folder"/>
- <delete dir="${wst-folder}" quiet="true"/>
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-ws-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.wst.ws.tests.unittest.AllWSJUnitTests" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-<!-- <property name="extraVMargs" value="${extraVMargs}"/> -->
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project>
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/test/popup/NewAction.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/test/popup/NewAction.java
deleted file mode 100644
index 0fa1be3..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/test/popup/NewAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.wst.ws.test.popup;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-import org.osgi.framework.Bundle;
-
-public class NewAction implements IObjectActionDelegate {
-
- IStructuredSelection selection;
-
- /**
- * Constructor for Action1.
- */
- public NewAction() {
- super();
- }
-
- /**
- * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
- */
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- }
-
- /**
- * @see IActionDelegate#run(IAction)
- */
- public void run(IAction action)
- {
- DynamicWizard wizard = new DynamicWizard();
- WizardDialog dialog = new WizardDialog( null, wizard );
-
- try
- {
- Bundle bundle = Platform.getBundle( "org.eclipse.wst.ws.tests" );
- wizard.setInitialData( "org.eclipse.jst.ws.creation.ui.wizard.serverwizard", bundle, "icons/full/wizban/webservices_wiz.png", "Peter title" );
- wizard.init( PlatformUI.getWorkbench(), selection );
-
- dialog.open();
- }
- catch( CoreException exc )
- {
- exc.printStackTrace();
- }
- }
-
- /**
- * @see IActionDelegate#selectionChanged(IAction, ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection)
- {
- if( selection instanceof IStructuredSelection )
- {
- this.selection = (IStructuredSelection ) selection;
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java
deleted file mode 100644
index f455fa9..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.eclipse.wst.ws.tests.data;
-
-import java.io.IOException;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.intro.IIntroManager;
-import org.eclipse.ui.intro.IIntroPart;
-import org.eclipse.wst.ws.tests.plugin.TestsPlugin;
-
-/**
- * @author joan
- * Sets up locator test data - uses same data file but renames it for each use
- * Workspace structure created looks like this:
- *
- * root
- * --project1
- * |----folder1
- * |-----folder2
- * |------one.wsdl
- * |-----two.wsdl
- * |----folder3
- * |-----three.wsdl
- * |-----four.wsdl
- * --project2
- * |----five.wsdl
- * |----folder4
- * |----folder5
- * |-----six.wsdl
- * --project3
- * |----one.xml
- */
-
-public class LocatorWorkspaceSetup extends TestCase {
-
- public static String PROJECT1_NAME = "Project1";
- public static String FOLDER1_NAME = "Folder1"; //contains WSDL file and one folder
- public static String FOLDER2_NAME = "Folder2"; //nested in folder 1 and contains WSDL file
- public static String FOLDER3_NAME = "Folder3"; //contains two WSDL files
- public static String PROJECT2_NAME = "Project2"; //contains WSDL file and two folders
- public static String FOLDER4_NAME = "Folder4"; //contains no WSDL
- public static String FOLDER5_NAME = "Folder5"; //contains one WSDL file
- public static String PROJECT3_NAME = "Project3"; //contains no WSDL files but one XML file
-
- public static String WSDLFILE_ONE = "one.wsdl";
- public static String WSDLFILE_TWO = "two.wsdl";
- public static String WSDLFILE_THREE = "three.wsdl";
- public static String WSDLFILE_FOUR = "four.wsdl";
- public static String WSDLFILE_FIVE = "five.wsdl";
- public static String WSDLFILE_SIX = "six.wsdl";
- public static String XMLFILE_ONE = "one.XML";
-
- public static String ACTUAL_TESTFILEPATH = "data/locator/test.wsdl";
-
- private IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
- public static Test suite()
- {
- return new TestSuite(LocatorWorkspaceSetup.class, "LocatorWorkspaceSetup");
- }
-
- protected void closeIntro()
- {
- IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
- IIntroPart introPart = introManager.getIntro();
- if (introPart != null)
- introManager.closeIntro(introPart);
- }
-
- protected IProject createSimpleProject(String name) throws CoreException
- {
- IProject simpleProject = root.getProject(name);
- simpleProject.create(null);
- simpleProject.open(null);
- return simpleProject;
- }
-
- protected IFolder createFolder(IContainer parent, String folderName) throws CoreException
- {
- IFolder folder1 = parent.getFolder(new Path(folderName));
- folder1.create(false, true, null);
- return folder1;
- }
-
-
- protected void copyFile(IContainer project, String source, String dest) throws IOException, CoreException
- {
-
- IFile file = project.getFile(new Path(dest));
- file.create(TestsPlugin.getDefault().getBundle().getEntry(source).openStream(), true, null);
- Assert.assertTrue(file.exists());
- }
-
- protected void joinAutoBuild() throws CoreException
- {
- boolean interrupted = true;
- while (interrupted)
- {
- try
- {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
- interrupted = false;
- }
- catch (InterruptedException e)
- {
- interrupted = true;
- }
- }
- }
-
- public void testSetup() throws Exception
- {
- try{
- System.out.println("------ locator data setup starting");
- closeIntro();
-
- IProject project1 = createSimpleProject(PROJECT1_NAME);
- IFolder folder1 = createFolder(project1, FOLDER1_NAME);
- copyFile(folder1, ACTUAL_TESTFILEPATH, WSDLFILE_TWO);
- IFolder folder2 = createFolder(folder1, FOLDER2_NAME);
- copyFile(folder2, ACTUAL_TESTFILEPATH, WSDLFILE_ONE);
- IFolder folder3 = createFolder(project1, FOLDER3_NAME);
- copyFile(folder3, ACTUAL_TESTFILEPATH, WSDLFILE_THREE);
- copyFile(folder3, ACTUAL_TESTFILEPATH, WSDLFILE_FOUR);
-
- IProject project2 = createSimpleProject(PROJECT2_NAME);
- copyFile(project2, ACTUAL_TESTFILEPATH, WSDLFILE_FIVE);
- createFolder(project2, FOLDER4_NAME); //folder with no content
- IFolder folder5 = createFolder(project2, FOLDER5_NAME);
- copyFile(folder5, ACTUAL_TESTFILEPATH, WSDLFILE_SIX);
- IProject project3 = createSimpleProject(PROJECT3_NAME);
- copyFile(project3, ACTUAL_TESTFILEPATH, XMLFILE_ONE);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- //code to check workspace set up - debug
- /*DataResourceVisitor visitor = new DataResourceVisitor();
- root.accept(visitor);
- visitor.visit(root);*/
-
- System.out.println("------ locator data setup complete");
- }
-
- protected class DataResourceVisitor implements IResourceVisitor
- {
- public boolean visit(IResource resource) throws CoreException {
- if ((resource instanceof IProject) || (resource instanceof IFolder))
- {
- System.out.println("visiting " + resource.getName());
- }
- else if (resource instanceof IFile)
- {
- System.out.println("found file " + resource.getName());
- }
- return true;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java
deleted file mode 100644
index da56b67..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.wst.ws.tests.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
- //The shared instance.
- private static TestsPlugin plugin;
-
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static TestsPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java
deleted file mode 100644
index 7dccda5..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.tests.unittest;
-
-import org.eclipse.wst.ws.tests.data.LocatorWorkspaceSetup;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * This class is to run all the unittest tests.
- */
-public class AllWSJUnitTests extends TestCase
-{
- /**
- * Method parseArgs.
- *
- * @param args
- */
- private void parseArgs(Object args)
- {
- // typicially args is an array of strings,
- // not sure when it wouldn't be.
- }
-
- public static void main(String[] args)
- {
- new AllWSJUnitTests().runMain(args);
- }
-
- public Object runMain(Object args)
- {
- Object result = null;
- try
- {
- TestRunner testRunner = null;
-
- parseArgs(args);
-
- testRunner = new TestRunner(System.out);
-
-
- Test suite = suite();
- TestResult testResult = testRunner.doRun(suite, false);
- printHeader(testResult);
- }
- catch (Exception e)
- {
- result = e;
- }
-
- return result;
- }
-
- public static Test suite()
- {
- TestSuite testSuite = new TestSuite();
- //add unit tests to suite here...
- testSuite.addTest( LocatorWorkspaceSetup.suite());
- testSuite.addTest( WebServiceFinderTests.suite());
- testSuite.addTest( WSDLCopierTests.suite());
- return testSuite;
- }
-
- /**
- * Prints the header of the report
- */
- protected void printHeader(TestResult result)
- {
- if (result.wasSuccessful())
- {
- System.out.println();
- System.out.print("OK");
- System.out.println(" (" + result.runCount() + " tests)");
-
- }
- else
- {
- System.out.println();
- System.out.println("FAILURES!!!");
- System.out.println(
- "Tests run: "
- + result.runCount()
- + ", Failures: "
- + result.failureCount()
- + ", Errors: "
- + result.errorCount());
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java
deleted file mode 100644
index 3a6efe7..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.wst.ws.tests.unittest;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * Minimal app to run as Eclipse "application"
- */
-public class LaunchTest implements IPlatformRunnable
-{
- /**
- * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object)
- */
- public Object run(Object args) throws Exception
- {
-
- Object result = new AllWSJUnitTests().runMain(args);
-
- if (result != null)
- {
- if (result instanceof Throwable)
- {
- ((Throwable) result).printStackTrace();
- }
- else
- {
- System.out.println("tests didn't return 'ok'");
- }
- return result;
- }
- else
- return IPlatformRunnable.EXIT_OK;
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/RegistryTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/RegistryTests.java
deleted file mode 100644
index 15a36e6..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/RegistryTests.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.tests.unittest;
-
-import java.io.File;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.model.v10.registry.Name;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryFactory;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyFactory;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryFactory;
-import org.eclipse.wst.ws.internal.registry.IRegistryManager;
-import org.eclipse.wst.ws.internal.registry.RegistryService;
-import org.eclipse.wst.ws.internal.registry.UDDIRegistryService;
-
-public class RegistryTests extends TestCase
-{
- public static Test suite ()
- {
- return new TestSuite(RegistryTests.class);
- }
-
- /**
- * Creates a new Taxonomy model and passes it to
- * <code>RegistryService.saveTaxonomy()</code>
- * where the model is persisted to a platform
- * specified temporary filesystem location.
- */
- public void test_RegistryService_saveTaxonomy ()
- {
- System.out.println("STARTING test_RegistryService_saveTaxonomy");
- try
- {
- System.out.println("Creating RegistryService and Taxonomy");
- RegistryService registryService = RegistryService.instance();
- Taxonomy taxonomy = registryService.newTaxonomy();
-
- System.out.println("Building a simple Taxonomy model");
- taxonomy.setId("my.taxonomy");
- taxonomy.setName("My Taxonomy");
- EList list = taxonomy.getCategory();
- Category category1 = TaxonomyFactory.eINSTANCE.createCategory();
- category1.setName("My first category");
- category1.setCode("1");
- Category category2 = TaxonomyFactory.eINSTANCE.createCategory();
- category2.setName("My second category");
- category2.setCode("2");
- Category category3 = TaxonomyFactory.eINSTANCE.createCategory();
- category3.setName("My third category");
- category3.setCode("2.1");
- category2.getCategory().add(category3);
- list.add(category1);
- list.add(category2);
-
- File file = File.createTempFile("taxonomy.",".xml");
- System.out.println("Saving the Taxonomy model to "+file.getCanonicalPath());
- registryService.saveTaxonomy(file.toURL(),taxonomy);
- }
- catch (Exception exc)
- {
- exc.printStackTrace();
- fail("Unexpected Throwable ["+exc.getMessage()+"]");
- }
- finally
- {
- System.out.println("FINISHED test_RegistryService_saveTaxonomy\n");
- }
- }
-
- /**
- * Creates a new UDDI Registry model and passes it to
- * <code>RegistryService.saveRegistry()</code>
- * where the model is persisted to a platform
- * specified temporary filesystem location.
- */
- public void test_RegistryService_saveRegistry ()
- {
- System.out.println("STARTING test_RegistryService_saveRegistry");
- try
- {
- System.out.println("Creating RegistryService, UDDIRegistryService and Registry");
- RegistryService registryService = RegistryService.instance();
- UDDIRegistryService uddiRegistryService = UDDIRegistryService.instance();
- UDDIRegistry uddiRegistry = uddiRegistryService.newUDDIRegistry();
-
- System.out.println("Building a simple Registry model");
- uddiRegistry.setId("my.registry");
- uddiRegistry.setVersion("2.0");
- uddiRegistry.setDiscoveryURL("http://some.discovery.url");
- uddiRegistry.setPublicationURL("http://some.publication.url");
- uddiRegistry.setDefaultLogin("hockeyfanatic");
- Name name = RegistryFactory.eINSTANCE.createName();
- name.setValue("My Registry");
- uddiRegistry.getName().add(name);
- Taxonomy taxonomyRef = registryService.newTaxonomy();
- taxonomyRef.setRef("my.taxonomy");
- Taxonomies t = uddiRegistry.getTaxonomies();
- if (t == null)
- {
- t = UDDIRegistryFactory.eINSTANCE.createTaxonomies();
- uddiRegistry.setTaxonomies(t);
- }
- EList e = t.getTaxonomy();
- e.add(taxonomyRef);
-
- File file = File.createTempFile("registry.",".xml");
- System.out.println("Saving the Registry model to "+file.getCanonicalPath());
- registryService.saveRegistry(file.toURL(),uddiRegistry);
- }
- catch (Exception exc)
- {
- exc.printStackTrace();
- fail("Unexpected Throwable ["+exc.getMessage()+"]");
- }
- finally
- {
- System.out.println("FINISHED test_RegistryService_saveRegistry\n");
- }
- }
-
- /**
- * Creates a new UDDI Registry model and a new Taxonomy
- * model, associates the latter with the former, and
- * drives <code>IRegistryManager.saveRegistry()</code>
- * to save the models and the index document to the
- * preferred location of the default registry manager.
- */
- public void test_RegistryManager_saveRegistry()
- {
- System.out.println("STARTING test_RegistryManager_saveRegistry");
- try {
- System.out.println("Creating RegistryService and Getting RegistryManager");
- RegistryService registryService = RegistryService.instance();
- IRegistryManager regManager = registryService.getDefaultRegistryManager();
- System.out.println("The location of the default index is " + regManager.getURL());
-
- //build the hockey taxonomy
- System.out.println("Building the hockey Taxonomy model");
- Taxonomy hockeyTaxonomy = registryService.newTaxonomy();
- hockeyTaxonomy.setId("hockey.taxonomy");
- hockeyTaxonomy.setName("hockey Taxonomy");
- EList list = hockeyTaxonomy.getCategory();
- Category category1 = TaxonomyFactory.eINSTANCE.createCategory();
- Category category4 = TaxonomyFactory.eINSTANCE.createCategory();
- category4.setName("Pro");
- category4.setCode("4");
- Category category5 = TaxonomyFactory.eINSTANCE.createCategory();
- category5.setName("AHL");
- category5.setCode("4.1");
- Category category6 = TaxonomyFactory.eINSTANCE.createCategory();
- category6.setName("NHL");
- category6.setCode("4.2");
- category1.setName("Junior");
- category1.setCode("1");
- Category category2 = TaxonomyFactory.eINSTANCE.createCategory();
- category2.setName("Midget");
- category2.setCode("2");
- Category category3 = TaxonomyFactory.eINSTANCE.createCategory();
- category3.setName("Bantam");
- category3.setCode("3");
- category4.getCategory().add(category5);
- category4.getCategory().add(category6);
- list.add(category1);
- list.add(category2);
- list.add(category3);
- list.add(category4);
-
- //save the hockey taxonomy
- Taxonomy hockeyTaxonomyRef = regManager.saveTaxonomy(hockeyTaxonomy);
-
- //make the hockey registry
- System.out.println("Building the hockey Registry model");
- UDDIRegistryService uddiRegistryService = UDDIRegistryService.instance();
- UDDIRegistry uddiRegistry = uddiRegistryService.newUDDIRegistry();
- uddiRegistry.setId("hockey.registry");
- uddiRegistry.setVersion("2.0");
- uddiRegistry.setDefaultLogin("hockeyfanatic");
- uddiRegistry.setDiscoveryURL("http://some.discovery.url");
- uddiRegistry.setPublicationURL("http://some.publication.url");
- Name name = RegistryFactory.eINSTANCE.createName();
- name.setValue("Hockey Registry");
- uddiRegistry.getName().add(name);
-
- // Add the reference to the taxonomy (saved above) to the registry.
- uddiRegistryService.addTaxonomy(uddiRegistry,hockeyTaxonomyRef);
-
- /*
- UDDITaxonomyFinder UITFinder = new UDDITaxonomyFinder();
- regManager.addTaxonomyFinder(uddiRegistry.getClass().getName(),UITFinder);
- */
- // Save the thing.
- System.out.println("Saving the hockey Registry model");
- regManager.saveRegistry(uddiRegistry);
- }
- catch (Exception exc)
- {
- exc.printStackTrace();
- fail("Unexpected Throwable ["+exc.getMessage()+"]");
- }
- finally
- {
- System.out.println("FINISHED test_RegistryManager_saveRegistry\n");
- }
- }
-
- /**
- * Loads the registry and taxonomy in the index created in
- * test_RegistryManager_saveRegistry, then asserts that the
- * content of the model is what we expect.
- */
- public void test_RegistryManager_loadRegistry()
- {
- System.out.println("STARTING test_RegistryManager_loadRegistry");
- try {
- // Setup
- System.out.println("Creating RegistryService and Getting RegistryManager");
- RegistryService registryService = RegistryService.instance();
- IRegistryManager regManager = registryService.getDefaultRegistryManager();
-
- // Get the one registry URI we expect, and load the registry.
- String[] registries = regManager.getRegistryURIs();
- assertEquals("Unexpected number of registries "+registries.length,registries.length,1);
- String uri = registries[0];
- System.out.println("Loading registry " + uri);
- Registry registry = regManager.loadRegistry(uri);
- System.out.println("Found registry " + registry.getId());
- assertEquals("Did not find hockey registry","hockey.registry",registry.getId());
-
- // It's supposed to be a UDDI registry. Verify it and check its values.
- assertTrue("Registry is not a UDDIRegistry",(registry instanceof UDDIRegistry));
- UDDIRegistry uddiRegistry = (UDDIRegistry)registry;
- assertEquals(uddiRegistry.getVersion(),"2.0");
- assertEquals(uddiRegistry.getDefaultLogin(),"hockeyfanatic");
- assertEquals(uddiRegistry.getDiscoveryURL(),"http://some.discovery.url");
- assertEquals(uddiRegistry.getPublicationURL(),"http://some.publication.url");
-
- // Load the taxonomies used the UDDI registry.
- UDDIRegistryService uddiRegistryService = UDDIRegistryService.instance();
- Taxonomy[] taxonomies = regManager.loadTaxonomies(uddiRegistryService.getTaxonomyURIs(uddiRegistry));
- assertEquals("Unexpected number of taxonomies "+taxonomies.length,taxonomies.length,1);
- Taxonomy taxonomy = taxonomies[0];
- System.out.println("Found taxonomy " + taxonomy.getId());
- Assert.assertEquals("Did not find hockey taxonomy","hockey.taxonomy",taxonomy.getId());
-
- // Dump out the values (no assertions here).
- EList cList = taxonomy.getCategory();
- for(int i = 0;i<cList.size();i++){
- Category category = (Category)cList.get(i);
- System.out.println("Found category " + category.getName());
- EList c2List = category.getCategory();
- for(int j = 0;j<c2List.size();j++){
- Category iCategory = (Category)c2List.get(j);
- System.out.println("Found subcategory " + iCategory.getName());
- }
- }
- }
- catch(Exception t)
- {
- t.printStackTrace();
- fail("Unexpected Throwable ["+t.getMessage()+"]");
- }
- finally
- {
- System.out.println("FINISHED test_RegistryManager_loadRegistry\n");
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/TestBundleUtils.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/TestBundleUtils.java
deleted file mode 100644
index e822a12..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/TestBundleUtils.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.wst.ws.tests.unittest;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-import org.osgi.framework.Version;
-
-public class TestBundleUtils extends TestCase {
-
- public void testGetVersion() {
- Version version = BundleUtils.getVersion("org.eclipse.wst.ws");
- assertNotNull("version should never be null", version);
- }
-
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSDLCopierTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSDLCopierTests.java
deleted file mode 100644
index c15e7a7..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSDLCopierTests.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070126 171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20070409 181635 makandre@ca.ibm.com - Andrew Mak, WSDLCopier utility should create target folder
- *******************************************************************************/
-
-package org.eclipse.wst.ws.tests.unittest;
-
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-import org.eclipse.wst.ws.tests.plugin.TestsPlugin;
-
-/**
- * JUnit tests for WSDLCopier
- */
-public class WSDLCopierTests extends TestCase {
-
- private static final String DATA_DIR = "data/wsdlcopier/";
-
- private static final String WSDL_FOLDER1 = "wsdl1";
- private static final String WSDL_FOLDER2 = "wsdl2";
- private static final String WSDL_FOLDER3 = "wsdl3";
- private static final String WSDL_FOLDER4 = "wsdl4";
-
- private IProject project;
-
- /**
- * Return suite of tests to run.
- *
- * @return A TestSuite.
- */
- public static Test suite() {
- TestSuite suite = new TestSuite("WSDLCopierTests");
- suite.addTest(new WSDLCopierTests("testCase1"));
- suite.addTest(new WSDLCopierTests("testCase2"));
- suite.addTest(new WSDLCopierTests("testCase3"));
- suite.addTest(new WSDLCopierTests("testCase4"));
- suite.addTest(new WSDLCopierTests("testCase5"));
- suite.addTest(new WSDLCopierTests("testCase6"));
- return suite;
- }
-
- /**
- * Constructor.
- *
- * @param name Test method name.
- */
- public WSDLCopierTests(String name) {
- super(name);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("WSDLCopierTests");
-
- if (!project.exists())
- project.create(null);
-
- if (!project.isOpen())
- project.open(null);
- }
-
- /**
- * Create a folder.
- * @param name Name of folder.
- * @return The created folder.
- * @throws CoreException
- */
- protected IFolder createFolder(String name) throws CoreException {
- IFolder folder = project.getFolder(new Path(name));
- folder.create(false, true, null);
- return folder;
- }
-
- /*
- * Validate the directory structure of the target folder after copying.
- */
- private void validate(IFolder folder, String filename) {
- assertNotNull(folder.findMember("1/2/3/test.wsdl"));
- assertNotNull(folder.findMember("1/2a/" + filename));
- assertNotNull(folder.findMember("1/2a/test.xsd"));
- assertNotNull(folder.findMember("test.xsd"));
- }
-
- /*
- * Validate the timestamps of the files have not changed.
- */
- private long[] validateTimestamps(IFolder folder, long[] oldTimestamps) {
-
- long[] currentTimestamps = new long[3];
-
- currentTimestamps[0] = folder.findMember("1/2/3/test.wsdl").getModificationStamp();
- if (oldTimestamps != null) assertEquals(currentTimestamps[0], oldTimestamps[0]);
-
- currentTimestamps[1] = folder.findMember("1/2a/test.xsd").getModificationStamp();
- if (oldTimestamps != null) assertEquals(currentTimestamps[1], oldTimestamps[1]);
-
- currentTimestamps[2] = folder.findMember("test.xsd").getModificationStamp();
- if (oldTimestamps != null) assertEquals(currentTimestamps[2], oldTimestamps[2]);
-
- return currentTimestamps;
- }
-
- /**
- * Test case #1
- * - copies wsdl from test data directory using file:/ URI
- */
- public void testCase1() {
- try {
- URL url = TestsPlugin.getDefault().getBundle().getEntry(DATA_DIR + "1/2a/start.wsdl");
- url = FileLocator.toFileURL(url);
-
- IFolder folder = createFolder(WSDL_FOLDER1);
- String folderURI = "platform:/resource" + folder.getFullPath();
-
- System.out.println("Copying from: " + url);
- System.out.println("Copying to: " + folderURI);
-
- WSDLCopier copier = new WSDLCopier();
- copier.setSourceURI(url.toString());
- copier.setTargetFolderURI(folderURI);
-
- ResourcesPlugin.getWorkspace().run(copier, null);
- ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
-
- validate(folder, "start.wsdl");
- assertEquals(copier.getRelativePath().toString(), "1/2a/start.wsdl");
-
- System.out.println("Success!");
- }
- catch (Exception e) {
- System.out.println(e);
- assertTrue(e.getMessage(), false);
- }
- }
-
- /**
- * Test case #2
- * - copies wsdl from one folder to another using platform:/resource URI
- * - also changes the target filename
- */
- public void testCase2() {
- try {
- IResource resource = project.getFolder(WSDL_FOLDER1).findMember("1/2a/start.wsdl");
- IFolder folder = createFolder(WSDL_FOLDER2);
-
- String path = "platform:/resource" + resource.getFullPath();
- String folderURI = folder.getLocationURI().toString();
-
- System.out.println("Copying from: " + path);
- System.out.println("Copying to: " + folderURI);
-
- WSDLCopier copier = new WSDLCopier();
- copier.setSourceURI(path);
- copier.setTargetFolderURI(folderURI);
- copier.setTargetFilename("newname.wsdl");
-
- ResourcesPlugin.getWorkspace().run(copier, null);
- ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
-
- validate(folder, "newname.wsdl");
- assertEquals(copier.getRelativePath().toString(), "1/2a/newname.wsdl");
-
- System.out.println("Success!");
- }
- catch (Exception e) {
- System.out.println(e);
- assertTrue(e.getMessage(), false);
- }
- }
-
- /**
- * Test case #3
- * - runs the WSDLCopier without specifying a source URI (operation should fail)
- */
- public void testCase3() {
- try {
- IFolder folder = createFolder(WSDL_FOLDER3);
-
- String folderURI = folder.getLocationURI().toString();
-
- System.out.println("Copying from: N/A");
- System.out.println("Copying to: " + folderURI);
-
- WSDLCopier copier = new WSDLCopier();
- copier.setTargetFolderURI(folderURI);
-
- try {
- ResourcesPlugin.getWorkspace().run(copier, null);
- assertTrue("Should not get here", false);
- }
- catch (CoreException ce) {
- System.out.println(ce);
- }
-
- System.out.println("Success!");
- }
- catch (Exception e) {
- System.out.println(e);
- assertTrue(e.getMessage(), false);
- }
- }
-
- /**
- * Test case #4
- * - runs the WSDLCopier without creating a target folder
- */
- public void testCase4() {
- try {
- IResource resource = project.getFolder(WSDL_FOLDER1).findMember("1/2a/start.wsdl");
- IFolder folder = project.getFolder(WSDL_FOLDER4);
-
- String path = resource.getLocationURI().toString();
- String folderURI = "platform:/resource" + folder.getFullPath();
-
- System.out.println("Copying from: " + path);
- System.out.println("Copying to: " + folderURI);
- assertTrue(!folder.exists());
-
- WSDLCopier copier = new WSDLCopier();
- copier.setSourceURI(path);
- copier.setTargetFolderURI(folderURI);
-
- ResourcesPlugin.getWorkspace().run(copier, null);
- ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
-
- assertTrue(folder.exists());
- validate(folder, "start.wsdl");
- assertEquals(copier.getRelativePath().toString(), "1/2a/start.wsdl");
-
- System.out.println("Success!");
- }
- catch (Exception e) {
- System.out.println(e);
- assertTrue(e.getMessage(), false);
- }
- }
-
- /**
- * Test case #5
- * - runs the WSDLCopier without specifying a target folder (operation should fail)
- */
- public void testCase5() {
- try {
- IResource resource = project.getFolder(WSDL_FOLDER1).findMember("1/2a/start.wsdl");
-
- String path = "platform:/resource" + resource.getFullPath();
-
- System.out.println("Copying from: " + path);
- System.out.println("Copying to: N/A");
-
- WSDLCopier copier = new WSDLCopier();
- copier.setSourceURI(path);
-
- try {
- ResourcesPlugin.getWorkspace().run(copier, null);
- assertTrue("Should not get here", false);
- }
- catch (CoreException ce) {
- System.out.println(ce);
- }
-
- System.out.println("Success!");
- }
- catch (Exception e) {
- System.out.println(e);
- assertTrue(e.getMessage(), false);
- }
- }
-
- /**
- * Test case #6
- * - copies wsdl from one folder onto itself using platform:/resource URI
- */
- public void testCase6() {
- try {
- IFolder folder = project.getFolder(WSDL_FOLDER1);
- IResource resource = folder.findMember("1/2a/start.wsdl");
-
- String path = "platform:/resource" + resource.getFullPath();
- String folderURI = folder.getLocationURI().toString();
-
- System.out.println("Copying from: " + path);
- System.out.println("Copying to: " + folderURI);
-
- WSDLCopier copier = new WSDLCopier();
- copier.setSourceURI(path);
- copier.setTargetFolderURI(folderURI);
-
- long[] oldTimestamps = validateTimestamps(folder, null);
-
- ResourcesPlugin.getWorkspace().run(copier, null);
- ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
-
- validate(folder, "start.wsdl");
- validateTimestamps(folder, oldTimestamps);
- assertEquals(copier.getRelativePath().toString(), "1/2a/start.wsdl");
-
- System.out.println("Success!");
- }
- catch (Exception e) {
- System.out.println(e);
- assertTrue(e.getMessage(), false);
- }
- }
-}
-
-
-
-
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java
deleted file mode 100644
index fce5ff9..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.ws.tests.unittest;
-
-
-public interface WSJUnitConstants {
-
- public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
- public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
-
- public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-
- public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
-
- public final String webProjectName = "WP";
- public final String webProject2Name = "WP2";
- public final String webComponentName = "webComponent";
- public final String webComponent2Name = "webComp2";
- public final String webComp3Name = "webComp3";
- public final String webComp4Name = "webComp4";
-
-
- public final String ejbProjectName = "EJBProject";
- public final String ejbComponentName = "ejbComponent";
-
- public final String appClientProjectName = "AppClientProject";
- public final String appClientCompName = "appClientComponent";
-
- public final String earCompName = "EARComponent";
-
-}
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
deleted file mode 100644
index c01f197..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.wst.ws.tests.unittest;
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- * @author joan
- *
- */
-
-public class WebServiceFinderTests extends TestCase implements WSJUnitConstants {
-
- public static Test suite(){
- return new TestSuite(WebServiceFinderTests.class);
- }
-
- public void testWSFinder(){
- System.out.println("creating web service finder");
- WebServiceFinder wsf = WebServiceFinder.instance();
-
- System.out.println("attempting to locate all web services in workspace");
- Iterator wsIterator = wsf.getWebServices(null);
- while (wsIterator.hasNext()) {
- WebServiceInfo wsInfo = (WebServiceInfo) wsIterator.next();
- System.out.println("webService URL: " + wsInfo.getWsdlURL());
- }
-
- System.out.println("finished finding all webservices");
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/BuildClasspath.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/BuildClasspath.java
deleted file mode 100644
index 3d9623d..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/BuildClasspath.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.util.Enumeration;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.ManifestElement;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-
-/**
- * This program will generate a classpath that can be used to build the wsexplorer.war file.
- *
- */
-public class BuildClasspath implements IPlatformRunnable
-{
- public Object run(Object args) throws Exception
- {
- ResourceBundle pluginRequires = ResourceBundle.getBundle( "org.eclipse.wst.command.env.property.tools.ExplorerRequires" );
- Enumeration requireKeys = pluginRequires.getKeys();
-
- while( requireKeys.hasMoreElements() )
- {
- String key = (String)requireKeys.nextElement();
- buildClasspath( pluginRequires.getString(key) );
- }
-
- return IPlatformRunnable.EXIT_OK;
- }
-
- private void buildClasspath( String pluginId ) throws Exception
- {
- Bundle bundle = Platform.getBundle( pluginId );
- String classpath = (String)bundle.getHeaders().get( Constants.BUNDLE_CLASSPATH );
- String location = bundle.getLocation();
-
- // Add classpath to list
- ManifestElement[] classpaths = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, classpath);
-
- if( classpaths != null )
- {
- for( int index = 0; index < classpaths.length; index++ )
- {
- String newPath = null;
-
- // We have a special case for the SWT plugin since it
- if( location.indexOf( "org.eclipse.swt" ) != -1 )
- {
- Bundle[] bundles = Platform.getFragments( bundle );
- String newLocation = bundles[0].getLocation().substring(8);
- String path = classpaths[index].getValue().replaceFirst( "\\$ws\\$", "ws/win32");
-
- newPath = newLocation + path;
- }
- else if( location.startsWith( "update" ) )
- {
- newPath = location.substring(8) + classpaths[index].getValue();
- }
- else if( location.startsWith( "initial" ))
- {
- newPath = location.substring(23) + classpaths[index].getValue();
- }
- else if( location.startsWith( "System" ))
- {
- String platformLocation = Platform.getInstallLocation().getURL().toString().substring(6);
- newPath = platformLocation + "plugins/org.eclipse.osgi_3.0.1/" + classpaths[index].getValue();
- }
-
- System.out.print( newPath + ';');
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/CopyPropertyFiles.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/CopyPropertyFiles.java
deleted file mode 100644
index c0ee50f..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/CopyPropertyFiles.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.Vector;
-
-public class CopyPropertyFiles
-{
- public static void main( String[] args )
- {
- File startPath = new File( args[0] );
- String[] pluginFiles = Utils.readLines( args[1] );
- String newPath = args[2];
- String pathRelativeTo= args[3];
- Vector propertyFiles = new Vector();
-
- for( int index = 0; index < pluginFiles.length; index++ )
- {
- File pluginDir = Utils.getFile( startPath, pluginFiles[index] );
-
- if( pluginDir != null )
- {
- Utils.getFiles( pluginDir, propertyFiles, "properties", new String[]{ "bin", "build.properties",
- } );
- }
- }
-
- // Loop through each property file
- for( int index = 0; index < propertyFiles.size(); index++ )
- {
- File propFile = (File)propertyFiles.elementAt(index);
- String propName = propFile.getAbsolutePath();
- int pluginIndex = propName.indexOf( pathRelativeTo );
- int firstSlash = propName.indexOf( "\\", pluginIndex );
- int nextSlash = propName.indexOf( "\\", firstSlash+1 );
- String pluginName = propName.substring( firstSlash + 1, nextSlash );
- int underIndex = pluginName.indexOf( '_' );
-
- if( underIndex != -1 )
- {
- pluginName = pluginName.substring( 0, underIndex );
- }
-
- String newName = newPath + File.separator + "plugins" +
- File.separator + pluginName +
- File.separator + propName.substring( nextSlash+1, propName.length() );
-
- File newFile = new File( newName );
- File parent = new File( newFile.getParent() );
- PrintWriter writer = null;
-
- try
- {
- parent.mkdirs();
-
- writer = new PrintWriter( new FileWriter( newFile ));
- String[] lines = Utils.readLines( propFile );
-
- for( int lineIndex = 0; lineIndex < lines.length; lineIndex++ )
- {
- writer.println( lines[lineIndex] );
- }
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- try
- {
- if( writer != null ) writer.close();
- }
- catch( Exception exc )
- {
- }
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindContextIds.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindContextIds.java
deleted file mode 100644
index 0fb6303..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindContextIds.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.Vector;
-
-/*
- * This class is used to find Context IDs in source files.
- * args[0] = The root directory where plugins source directories will be searched.
- * args[1] = A file containing plugin source directories. Each line should contain
- * a path to a source directory relative to the args[0] parameter.
- * args[2] = The output file name.
- */
-public class FindContextIds
-{
- public void findIds( String rootDirectory, String sourceDirectoryName, String outputFileName )
- {
- File sourceDirectoryFile = new File( sourceDirectoryName );
- String[] srcDirLines = Utils.readLines( sourceDirectoryFile );
- PrintWriter outputFile = null;
-
- try
- {
- outputFile = new PrintWriter( new FileWriter( outputFileName ) );
-
- for( int index = 0; index < srcDirLines.length; index++ )
- {
- String sourceDirName = srcDirLines[index];
- File sourceDirectory = new File( rootDirectory, sourceDirName );
-
- outputFile.println( "======>Context IDs for plugin directory: " + sourceDirName );
-
- findIdsForaDirectory( sourceDirectory, outputFile );
- }
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- if( outputFile != null )
- {
- outputFile.close();
- }
- }
- }
-
- static public void main( String[] args )
- {
- FindContextIds findIds = new FindContextIds();
-
- if( args.length != 3 )
- {
- System.out.println( "Error: expecting a root directory, the source directory file name, and an output file as parameters." );
- return;
- }
-
- findIds.findIds( args[0], args[1], args[2] );
- }
-
- private boolean findIdsForaDirectory( File sourceDirectory, PrintWriter outputFile )
- {
- Vector files = new Vector();
- boolean found = false;
-
- Utils.getFiles( sourceDirectory, files, "java", new String[0] );
-
- // Loop through each file.
- for( int fileIndex = 0; fileIndex < files.size(); fileIndex++ )
- {
- String[] lines = Utils.readLines( (File)files.elementAt(fileIndex) );
-
- // Loop through each line in the file.
- for( int lineIndex = 0; lineIndex < lines.length; lineIndex++ )
- {
- String line = lines[lineIndex];
-
- if( line.indexOf("CONTEXT_ID") != -1 )
- {
- outputFile.println( line );
- found = true;
- }
- }
- }
-
- return found;
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindDuplicateKeys.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindDuplicateKeys.java
deleted file mode 100644
index 502ffd8..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindDuplicateKeys.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-public class FindDuplicateKeys
-{
- public static void main( String[] args )
- {
- File startPath = new File( args[0] );
- String[] pluginFiles = Utils.readLines( args[1] );
- Vector propertyFiles = new Vector();
- Hashtable keys = new Hashtable();
- PrintWriter writer = null;
- Hashtable srcKeys = new Hashtable();
- Vector srcFiles = new Vector();
- Vector propNames = new Vector();
- Vector pluginNames = new Vector();
- String[] pluginArray = null;
- Hashtable srcPluginMap = new Hashtable();
-
- try
- {
- writer = new PrintWriter( new FileWriter( args[2] ));
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
-
- for( int index = 0; index < pluginFiles.length; index++ )
- {
- File pluginDir = Utils.getFile( startPath, pluginFiles[index] );
-
- Utils.getFiles( pluginDir, propertyFiles, "properties", new String[]{ "bin", "build.properties",
- "wsexplorer.properties",
- "uddi.properties",
- "wsdl.properties",
- "wsil.properties",
- "favorites.properties"
- } );
- Utils.getFiles( pluginDir, srcFiles, "java", new String[0] );
- }
-
- // Loop through each property file
- for( int index = 0; index < propertyFiles.size(); index++ )
- {
- File propFile = (File)propertyFiles.elementAt(index);
- File parent = new File( propFile.getParent() );
-
- // Skip properties files that are in the plugin directory.
- if( Utils.stringInArray( parent.getName(), pluginFiles ) )
- {
- continue;
- }
-
- String propName = propFile.getAbsolutePath();
- int srcStart = propName.indexOf( "src" );
-
- if( srcStart != -1 )
- {
- int lastSlash = propName.lastIndexOf( '\\' );
- int lastDot = propName.lastIndexOf( '.' );
- String name = propName.substring( srcStart + 4, lastSlash );
- String name2 = propName.substring( srcStart + 4, lastDot );
- name = name.replace( '\\', '.' );
- name2 = name2.replace( '\\', '.' );
-
- pluginNames.add( name );
- pluginNames.add( name2 );
- //System.out.println( propName + ">>" + name + ">>" + name2 );
- }
- }
-
- pluginArray = (String[])pluginNames.toArray( new String[0] );
-
- // Find all the java strings.
- for( int index = 0; index < srcFiles.size(); index++ )
- {
- File srcFile = (File)srcFiles.elementAt(index);
- Vector fileSrcKeys = new Vector();
- String[] lines = Utils.readLines(srcFile );
-
- for( int srcIndex = 0; srcIndex < lines.length; srcIndex++ )
- {
- Utils.findJavaStrings( lines[srcIndex], fileSrcKeys );
- }
-
- for( int keysIndex = 0; keysIndex < fileSrcKeys.size(); keysIndex++ )
- {
- String key = (String)fileSrcKeys.elementAt( keysIndex );
- HashSet fileSet = (HashSet)srcKeys.get( key );
-
- if( fileSet == null )
- {
- fileSet = new HashSet();
- srcKeys.put( key, fileSet );
- }
-
- if( Utils.stringInArray( key, pluginArray ) )
- {
- HashSet names = (HashSet)srcPluginMap.get( srcFile );
-
- if( names == null )
- {
- names = new HashSet();
- srcPluginMap.put( srcFile, names );
- }
-
- names.add( key );
- }
-
- fileSet.add( srcFile );
- }
- }
-
- int count = 1;
-
- // Loop through each property file
- for( int index = 0; index < propertyFiles.size(); index++ )
- {
- File propFile = (File)propertyFiles.elementAt(index);
- Vector propKeys = Utils.getPropertyKeys( propFile );
- File parent = new File( propFile.getParent() );
-
- // Skip properties files that are in the plugin directory.
- if( Utils.stringInArray( parent.getName(), pluginFiles ) )
- {
- continue;
- }
-
- System.out.println( propFile.getAbsolutePath() );
-
- for( int propIndex = 0; propIndex < propKeys.size(); propIndex++ )
- {
- String propKey = (String)propKeys.elementAt( propIndex );
-
- if( keys.containsKey(propKey) && !propKey.startsWith( "PLUGIN" ))
- {
- File origFile = (File)keys.get( propKey );
-
- String origName = origFile.getAbsolutePath();
- String propName = propFile.getAbsolutePath();
-
- origName = origName.substring( args[0].length(), origName.length() );
- propName = propName.substring( args[0].length(), propName.length() );
-
- HashSet fileSet = (HashSet)srcKeys.get( propKey );
-
- if( fileSet != null )
- {
- writer.println( count + " Property: " + propKey + " is in both " +
- origName + " and " +
- propName );
-
- Iterator iter = fileSet.iterator();
-
- while( iter.hasNext() )
- {
- File file = (File)iter.next();
- writer.println( " >" + file.getAbsolutePath() );
-
- HashSet names = (HashSet)srcPluginMap.get( file );
- Iterator nameIter = names.iterator();
-
- while( nameIter.hasNext() )
- {
- writer.println( " >" + nameIter.next() );
- }
- }
-
- count++;
- }
- }
- else
- {
- keys.put( propKey, propFile );
- }
- }
- }
-
- try
- {
- if( writer != null ) writer.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindPercentString.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindPercentString.java
deleted file mode 100644
index 1cdef9f..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindPercentString.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.Vector;
-
-public class FindPercentString
-{
- public static void main( String[] args )
- {
- File startPath = new File( args[0] );
- String[] pluginFiles = Utils.readLines( args[1] );
- PrintWriter writer = null;
- Vector srcFiles = new Vector();
-
- try
- {
- writer = new PrintWriter( new FileWriter( args[2] ));
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
-
- for( int index = 0; index < pluginFiles.length; index++ )
- {
- File pluginDir = Utils.getFile( startPath, pluginFiles[index] );
-
- if( pluginDir != null )
- {
- Utils.getFiles( pluginDir, srcFiles, "java", new String[0] );
- }
- }
-
- // Find all the java strings.
- for( int index = 0; index < srcFiles.size(); index++ )
- {
- File srcFile = (File)srcFiles.elementAt(index);
- Vector fileSrcKeys = new Vector();
- String[] lines = Utils.readLines(srcFile );
-
- for( int srcIndex = 0; srcIndex < lines.length; srcIndex++ )
- {
- Utils.findJavaStrings( lines[srcIndex], fileSrcKeys );
- }
-
- for( int keysIndex = 0; keysIndex < fileSrcKeys.size(); keysIndex++ )
- {
- String key = (String)fileSrcKeys.elementAt( keysIndex );
-
- if( key.startsWith("%" ) )
- {
- writer.println( key + " >> " + srcFile.getName() );
- }
- }
- }
-
- try
- {
- if( writer != null ) writer.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindPropertyMovement.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindPropertyMovement.java
deleted file mode 100644
index ba66369..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindPropertyMovement.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.PropertyResourceBundle;
-import java.util.Set;
-import java.util.Vector;
-
-public class FindPropertyMovement
-{
- public static void main( String[] args )
- {
- File oldPath = new File( args[0] );
- File newPath = new File( args[1] );
- File outputFile = new File( args[2] );
-
- Vector oldPropertyFiles = new Vector();
- Vector newPropertyFiles = new Vector();
-
- Hashtable oldKeyMap = new Hashtable();
- Hashtable newKeyMap = new Hashtable();
-
- Utils.getFiles( oldPath, oldPropertyFiles, "properties", new String[0] );
- Utils.getFiles( newPath, newPropertyFiles, "properties", new String[0] );
-
- buildMap( oldPropertyFiles, oldKeyMap );
- buildMap( newPropertyFiles, newKeyMap );
-
- Set newKeySet = newKeyMap.entrySet();
- Iterator iter = newKeySet.iterator();
- PrintWriter writer = null;
-
- try
- {
- writer = new PrintWriter( new FileWriter( outputFile ));
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
-
- while( iter.hasNext() && writer != null )
- {
- Map.Entry entry = (Map.Entry)iter.next();
- String property = (String)entry.getKey();
- String newFileName = (String)entry.getValue();
- String oldFileName = (String)oldKeyMap.get( property );
-
- if( oldFileName == null || newFileName.equals( oldFileName ) )
- {
- // Do nothing. Either this key didn't exist in the old property
- // files or this key is still in the same property file.
- }
- else
- {
- writer.println( property + " " + oldFileName + " " + newFileName );
- }
- }
-
- try
- {
- if( writer != null ) writer.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
-
- private static void buildMap( Vector inputFiles, Hashtable keyMap )
- {
- for( int index = 0; index < inputFiles.size(); index++ )
- {
- File propFile = (File)inputFiles.elementAt(index);
- String propName = propFile.getAbsolutePath();
- int pluginIndex = propName.indexOf( "plugins" );
- String propString = propName.substring( pluginIndex, propName.length() );
- InputStream stream = null;
-
- try
- {
- stream = new FileInputStream( propFile );
- PropertyResourceBundle bundle = new PropertyResourceBundle( stream );
-
- Enumeration keys = bundle.getKeys();
-
- while( keys.hasMoreElements() )
- {
- keyMap.put( keys.nextElement(), propString );
- }
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- try
- {
- if( stream != null ) stream.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/GenPluginPropertiesFromPluginXml.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/GenPluginPropertiesFromPluginXml.java
deleted file mode 100644
index e66ddf0..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/GenPluginPropertiesFromPluginXml.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.HashSet;
-
-public class GenPluginPropertiesFromPluginXml
-{
- public static void main( String[] args )
- {
- File startPath = new File( args[0] );
- String[] pluginFiles = Utils.readLines( args[1] );
-
- for( int index = 0; index < pluginFiles.length; index++ )
- {
- String filename = pluginFiles[index];
-
- HashSet keys = new HashSet();
- File dir = Utils.getFile( startPath, filename );
- File file = Utils.getFile( dir, "plugin.xml" );
-
- if( file == null ) continue;
-
- Utils.getPluginXMLKeys( file, keys );
-
- File propfile = Utils.getFile( dir, "plugin.properties" );
-
- if( keys.size() > 0 && propfile == null )
- {
- try
- {
- System.out.println( "No plugin.properties file for:" + file );
- propfile = File.createTempFile( "prefix", "suffix" );
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
- else if( keys.size() == 0 )
- {
- continue;
- }
-
- File outputFile = new File( dir.getAbsolutePath() + File.separator + "plugin.properties.new" );
- File delFile = new File( dir.getAbsolutePath() + File.separator + "plugin.properties.del" );
- PrintWriter writer = null;
- PrintWriter delWriter = null;
-
- try
- {
- writer = new PrintWriter( new FileWriter( outputFile ) );
- delWriter = new PrintWriter( new FileWriter( delFile ));
- System.out.println( "Generating output to:" + outputFile );
- Utils.createOutputFile( keys, propfile, writer, delWriter );
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- try
- {
- if( writer != null ) writer.close();
- if( delWriter != null ) delWriter.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/ListPropertyFiles.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/ListPropertyFiles.java
deleted file mode 100644
index 2a0a6c2..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/ListPropertyFiles.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.util.Vector;
-
-public class ListPropertyFiles
-{
- public static void main( String[] args )
- {
- File startPath = new File( args[0] );
- Vector propertyFiles = new Vector();
-
- Utils.getFiles( startPath, propertyFiles, "backup", new String[]{ "bin", "build.properties",
- } );
-
- // Loop through each property file
- for( int index = 0; index < propertyFiles.size(); index++ )
- {
- File propFile = (File)propertyFiles.elementAt(index);
- String propName = propFile.getAbsolutePath();
- int pluginIndex = propName.indexOf( "plugins" );
- int firstSlash = propName.indexOf( "\\", pluginIndex );
- int nextSlash = propName.indexOf( "\\", firstSlash+1 );
- String pluginName = propName.substring( firstSlash + 1, nextSlash );
- int underIndex = pluginName.indexOf( '_' );
-
- if( underIndex != -1 )
- {
- pluginName = pluginName.substring( 0, underIndex );
- }
-
- String newName = "del plugins" +
- File.separator + pluginName +
- File.separator + propName.substring( nextSlash+1, propName.length() );
-
- System.out.println( newName );
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/RemoveBrackets.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/RemoveBrackets.java
deleted file mode 100644
index b35682b..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/RemoveBrackets.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.awt.Button;
-import java.awt.Event;
-import java.awt.Frame;
-import java.awt.GridLayout;
-import java.awt.TextArea;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-public class RemoveBrackets extends Frame
-{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3617292320299824176L;
- private TextArea inputArea_;
- private TextArea outputArea_;
- private Button button_;
-
- public RemoveBrackets()
- {
- super( "Convert HTML brackets" );
- }
-
- public static void main(String[] args)
- {
- RemoveBrackets convert = new RemoveBrackets();
-
- convert.buildUI();
- }
-
- private void buildUI()
- {
- GridLayout layout = new GridLayout(3,1);
- //layout.setColumns(1);
- setLayout( layout );
-
- inputArea_ = new TextArea( 10, 50 );
- outputArea_ = new TextArea( 10, 50 );
- button_ = new Button( "Press here to convert to HTML" );
-
- inputArea_.setEditable( true );
- outputArea_.setEditable( true );
- button_.addActionListener( new ActionListener()
- {
- public void actionPerformed( ActionEvent evt )
- {
- convertText();
- }
- });
-
- add( inputArea_ );
- add( button_ );
- add( outputArea_ );
- //setSize( 100, 100 );
- pack();
- show();
- }
-
- public boolean handleEvent( Event evt )
- {
- if( evt.id == Event.WINDOW_DESTROY )
- {
- System.exit(0);
- }
-
- return true;
- }
-
- private void convertText()
- {
- String inputString = inputArea_.getText();
- String outputString = inputString.replaceAll( "<", "<");
-
- outputString = outputString.replaceAll( ">", ">" );
-
- outputArea_.setText( outputString );
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/RemoveUnusedKeys.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/RemoveUnusedKeys.java
deleted file mode 100644
index f2ea86a..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/RemoveUnusedKeys.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class RemoveUnusedKeys
-{
- public static void main( String[] args )
- {
- File startPath = new File( args[0] );
- String[] pluginFiles = Utils.readLines( args[1] );
- Vector propertyFiles = new Vector();
- Hashtable keys = new Hashtable();
- Hashtable srcKeys = new Hashtable();
- Vector srcFiles = new Vector();
- Vector propNames = new Vector();
- Vector pluginNames = new Vector();
- String[] pluginArray = null;
- Hashtable srcPluginMap = new Hashtable();
-
-
- // Find all the property files.
- for( int index = 0; index < pluginFiles.length; index++ )
- {
- File pluginDir = Utils.getFile( startPath, pluginFiles[index] );
-
- if( pluginDir == null )
- {
- System.out.println( "Plugin: " + pluginFiles[index] + " not found!" );
- continue;
- }
-
- Utils.getFiles( pluginDir, propertyFiles, "properties", new String[]{ "bin", "build.properties",
- "wsexplorer.properties",
- "uddi.properties",
- "wsdl.properties",
- "wsil.properties",
- "favorites.properties",
- "newprops.properties",
- "delprops.properties"
- } );
- Utils.getFiles( pluginDir, srcFiles, "java", new String[0] );
- }
-
- // Loop through each property file
- for( int index = 0; index < propertyFiles.size(); index++ )
- {
- File propFile = (File)propertyFiles.elementAt(index);
- File parent = new File( propFile.getParent() );
-
- // Skip properties files that are in the plugin directory.
- if( Utils.stringInArray( parent.getName(), pluginFiles ) )
- {
- continue;
- }
-
- String propName = propFile.getAbsolutePath();
- int srcStart = propName.indexOf( "src" );
-
- if( srcStart != -1 )
- {
- int lastSlash = propName.lastIndexOf( '\\' );
- int lastDot = propName.lastIndexOf( '.' );
- String name = propName.substring( srcStart + 4, lastSlash );
- String name2 = propName.substring( srcStart + 4, lastDot );
- name = name.replace( '\\', '.' );
- name2 = name2.replace( '\\', '.' );
-
- pluginNames.add( name );
- pluginNames.add( name2 );
- //System.out.println( propName + ">>" + name + ">>" + name2 );
- }
- }
-
- pluginArray = (String[])pluginNames.toArray( new String[0] );
-
- // Find all the java strings.
- for( int index = 0; index < srcFiles.size(); index++ )
- {
- File srcFile = (File)srcFiles.elementAt(index);
- Vector fileSrcKeys = new Vector();
- String[] lines = Utils.readLines(srcFile );
-
- for( int srcIndex = 0; srcIndex < lines.length; srcIndex++ )
- {
- Utils.findJavaStrings( lines[srcIndex], fileSrcKeys );
- }
-
- for( int keysIndex = 0; keysIndex < fileSrcKeys.size(); keysIndex++ )
- {
- String key = (String)fileSrcKeys.elementAt( keysIndex );
- HashSet fileSet = (HashSet)srcKeys.get( key );
-
- if( fileSet == null )
- {
- fileSet = new HashSet();
- srcKeys.put( key, fileSet );
- }
-
- if( Utils.stringInArray( key, pluginArray ) )
- {
- HashSet names = (HashSet)srcPluginMap.get( srcFile );
-
- if( names == null )
- {
- names = new HashSet();
- srcPluginMap.put( srcFile, names );
- }
-
- names.add( key );
- }
-
- fileSet.add( srcFile );
- }
- }
-
- int count = 1;
-
- // Loop through each property file
- for( int index = 0; index < propertyFiles.size(); index++ )
- {
- File propFile = (File)propertyFiles.elementAt(index);
- Vector propKeys = Utils.getPropertyKeys( propFile );
- File parent = new File( propFile.getParent() );
-
- // Skip properties files that are in the plugin directory.
- if( Utils.stringInArray( parent.getName(), pluginFiles ) )
- {
- continue;
- }
-
- String propName = propFile.getAbsolutePath();
- int srcStart = propName.indexOf( "src" );
- String folderName = "";
- String pkgName = "";
-
- if( srcStart != -1 )
- {
- int lastSlash = propName.lastIndexOf( '\\' );
- String name = propName.substring( srcStart + 4, lastSlash );
- name = name.replace( '\\', '.' );
-
- pkgName = name;
- folderName = propName.substring( 0, lastSlash + 1 );
- }
- else
- {
- continue;
- }
-
- System.out.println( propFile.getAbsolutePath() );
-
- String newPropName = folderName + "newprops.properties";
- String delPropName = folderName + "delprops.properties";
-
- PrintWriter newPropertyFile = null;
- PrintWriter delPropertyFile = null;
-
- try
- {
- newPropertyFile = new PrintWriter( new FileWriter( newPropName ));
- delPropertyFile = new PrintWriter( new FileWriter( delPropName ));
-
- Utils.createOutputFile( srcKeys.keySet(), propFile, newPropertyFile, delPropertyFile );
-
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- if( newPropertyFile != null ) newPropertyFile.close();
- if( delPropertyFile != null ) delPropertyFile.close();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/UpdateFeatureXMLFiles.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/UpdateFeatureXMLFiles.java
deleted file mode 100644
index bcfaeec..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/UpdateFeatureXMLFiles.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.Vector;
-
-public class UpdateFeatureXMLFiles
-{
- public static void main( String[] args )
- {
- String rootPath = args[0];
- File rootFile = new File( rootPath );
- Vector featureFiles = new Vector();
-
- getFiles( featureFiles, rootFile );
-
- int size = featureFiles.size();
-
- for( int index = 0; index < size; index++ )
- {
- File file = (File)featureFiles.elementAt( index );
- String fileName = file.getName();
- int langIndex = fileName.indexOf( "feature_" );
- int dotIndex = fileName.indexOf( '.', langIndex );
- String lang = fileName.substring( langIndex + 8, dotIndex );
- String[] lines = Utils.readLines( file );
-
- PrintWriter writer = null;
- FileWriter fileWriter = null;
-
- try
- {
- fileWriter = new FileWriter( file );
- writer = new PrintWriter( fileWriter );
-
- for( int lineIndex = 0; lineIndex < lines.length; lineIndex++ )
- {
- String line = lines[lineIndex];
-
- if( line.indexOf( "licenseURL" ) != -1 )
- {
- writer.println( "licenseURL=license_" + lang + ".html" );
- }
- else
- {
- writer.println( line );
- }
- }
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- try
- {
- writer.close();
- fileWriter.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
- }
- }
-
- static private void getFiles( Vector files, File path )
- {
- if( path.isDirectory() )
- {
- File[] children = path.listFiles();
-
- for( int index = 0; index < children.length; index++ )
- {
- getFiles( files, children[index] );
- }
- }
- else
- {
- String pathName = path.getName();
-
- int index = pathName.indexOf( "feature_" );
-
- if( index != -1 )
- {
- files.add( path );
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/Utils.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/Utils.java
deleted file mode 100644
index aa20dbc..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/Utils.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package org.eclipse.wst.ws.tests.utils;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.PropertyResourceBundle;
-import java.util.Vector;
-
-public class Utils
-{
- public static void createOutputFile( Collection keys, File propsFile, PrintWriter outputFile, PrintWriter deleteFile )
- {
- String[] lines = readLines( propsFile );
- boolean continueLine = false;
- boolean deleteKey = false;
-
- for( int index = 0; index < lines.length; index++ )
- {
- String line = lines[index].trim();
-
- if( continueLine )
- {
- continueLine = line.endsWith( "\\" );
-
- if( !deleteKey )
- {
- outputFile.println( line );
- }
- else
- {
- deleteFile.println( line );
- }
-
- continue;
- }
-
- continueLine = line.endsWith( "\\" );
-
- boolean validKey = isLineKey( keys, line );
- boolean hasKey = line.indexOf( '=' ) != -1;
-
- if( validKey )
- {
- outputFile.println( line );
- deleteKey = false;
- }
- else if( hasKey )
- {
- deleteKey = true;
- deleteFile.println( line );
- }
- else
- {
- outputFile.println( line );
- }
- }
- }
-
- public static boolean isLineKey( Collection keys, String line )
- {
- boolean result = false;
- Iterator iter = keys.iterator();
- int equalIndex = line.indexOf( '=' );
- String key = null;
-
- if( equalIndex != -1 && !line.startsWith( "#" ))
- {
- key = line.substring( 0, equalIndex );
- }
-
- while( iter.hasNext() && key != null )
- {
- String collectionKey = (String)iter.next();
- if( key.equals( collectionKey ) || collectionKey.equals( '%' + key ) )
- {
- result = true;
- break;
- }
- }
-
- return result;
- }
-
- public static void getPluginXMLKeys( File file, HashSet keys )
- {
- BufferedReader reader = null;
-
- try
- {
- reader = new BufferedReader( new FileReader( file ) );
-
- String line = reader.readLine();
-
- while( line != null )
- {
- Vector linekeys = findKeys( line );
- keys.addAll( linekeys );
- line = reader.readLine();
- }
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- try
- {
- if( reader != null ) reader.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
- }
-
- public static File getFile( File base, final String child )
- {
- File[] file = base.listFiles( new FilenameFilter()
- {
- public boolean accept( File file, String name )
- {
- int index = name.indexOf( '_' );
-
- if( index != -1 )
- {
- name = name.substring( 0, index );
- }
-
- return name.endsWith( child );
- }
- } );
- return file.length == 0 ? null : file[0];
- }
-
- public static Vector findKeys( String line )
- {
- Vector keys = new Vector();
- int quotestart = line.indexOf( '"' );
- int quoteend = line.indexOf( '"', quotestart + 1 );
-
- while( quotestart != -1 && quoteend != -1 && quotestart < quoteend )
- {
- String key = line.substring( quotestart+1, quoteend );
-
- if( key.startsWith( "%") )
- {
- keys.add( key.substring(1, key.length() ) );
- }
-
- quotestart = line.indexOf( '"', quoteend+1 );
- quoteend = line.indexOf( '"', quotestart+1 );
- }
-
- return keys;
- }
-
- public static void findJavaStrings( String line, Vector keys )
- {
- int quotestart = line.indexOf( '"' );
- int quoteend = line.indexOf( '"', quotestart + 1 );
-
- while( quotestart != -1 && quoteend != -1 && quotestart < quoteend )
- {
- // Find last real ending quote.
- while( quotestart != -1 && quoteend != -1 && line.charAt( quoteend-1 ) == '\\' )
- {
- quoteend = line.indexOf( '"', quoteend + 1 );
- }
-
- if( quotestart == -1 || quoteend == -1 || quotestart > quoteend ) break;
-
- String key = line.substring( quotestart+1, quoteend );
-
- keys.add( key );
-
- quotestart = line.indexOf( '"', quoteend+1 );
- quoteend = line.indexOf( '"', quotestart+1 );
- }
- }
-
- public static String[] readLines( File file )
- {
- Vector files = new Vector();
- BufferedReader reader = null;
-
- try
- {
- reader = new BufferedReader( new FileReader( file ) );
-
- String line = reader.readLine();
-
- while( line != null )
- {
- files.add( line );
- line = reader.readLine();
- }
- }
- catch( Exception exc )
- {
- System.out.println( "Problem opening file:" + file );
- exc.printStackTrace();
- }
- finally
- {
- try
- {
- if( reader != null ) reader.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
-
- return (String[])files.toArray( new String[0] );
-
- }
-
- public static String[] readLines( String file )
- {
- return readLines( new File( file ) );
- }
-
- public static void getFiles( File file, Vector files, String fileSuffix, String[] excludeFiles )
- {
- if( stringInArray( file.getName(), excludeFiles ) )
- {
- // do nothing
- }
- else if( file.isDirectory() )
- {
- File[] dirfiles = file.listFiles();
-
- for( int index = 0; index < dirfiles.length; index++ )
- {
- getFiles( dirfiles[index], files, fileSuffix, excludeFiles );
- }
- }
- else if( file.getName().endsWith( fileSuffix ) )
- {
- files.add( file );
- }
- }
-
- public static boolean stringInArray( String name, String[] names )
- {
- boolean found = false;
-
- for( int index = 0; index < names.length; index++ )
- {
- if( name.equals( names[index] ))
- {
- found = true;
- break;
- }
- }
-
- return found;
- }
- public static Vector getPropertyKeys( File file )
- {
- Vector keys = new Vector();
- InputStream stream = null;
-
- try
- {
- stream = new FileInputStream( file );
-
- PropertyResourceBundle bundle = new PropertyResourceBundle( stream );
- Enumeration keyEnum = bundle.getKeys();
-
- while( keyEnum.hasMoreElements() )
- {
- keys.add( keyEnum.nextElement() );
- }
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- try
- {
- if( stream != null ) stream.close();
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
- }
-
- return keys;
- }
-}
diff --git a/tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF
index c40830e..16f2b9a 100644
--- a/tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.wsdl.tests; singleton:=true
-Bundle-Version: 1.0.105.qualifier
+Bundle-Version: 1.0.104.qualifier
Bundle-Activator: org.eclipse.wst.wsdl.tests.WSDLTestsPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/ImportMe.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/ImportMe.wsdl
deleted file mode 100644
index d8899d1..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/ImportMe.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions name="ImportMe" targetNamespace="http://www.example.org/ImportMe/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/ImportMe/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
- <xsd:schema targetNamespace="http://www.example.org/ImportMe/">
- <xsd:element name="NewOperation">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="in" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="NewOperationResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="out" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="NewOperationResponse1">
- <xsd:complexType>
- <xsd:sequence>
-
- <xsd:element name="out" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="ImportMeMessageRequest">
- <wsdl:part element="tns:NewOperation" name="parameters"/>
- </wsdl:message>
- <wsdl:message name="ImportMeMessageResponse">
- <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
- </wsdl:message>
- <wsdl:message name="ImportMeMessageExtra">
- <wsdl:part name="NewPart" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="NewOperationRequest">
- <wsdl:part name="parameters" element="tns:NewOperation"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="NewOperationResponse">
- <wsdl:part name="parameters" element="tns:NewOperationResponse1"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="ImportMe">
- <wsdl:operation name="NewOperation">
- <wsdl:input message="tns:ImportMeMessageRequest"/>
- <wsdl:output message="tns:ImportMeMessageResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:portType name="ImportPortTypeExtra">
- <wsdl:operation name="NewOperation">
- <wsdl:input message="tns:NewOperationRequest"></wsdl:input>
- <wsdl:output message="tns:NewOperationResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="ImportMeSOAP" type="tns:ImportMe">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="NewOperation">
- <soap:operation soapAction="http://www.example.org/ImportMe/NewOperation"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="ImportBindingExtra"
- type="tns:ImportPortTypeExtra">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="NewOperation">
- <soap:operation
- soapAction="http://www.example.org/ImportMe/NewOperation" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="ImportMe">
- <wsdl:port binding="tns:ImportMeSOAP" name="ImportMeSOAP">
- <soap:address location="http://www.example.org/"/>
- </wsdl:port>
- </wsdl:service>
- <wsdl:service name="ImportServiceExtra">
- <wsdl:port name="ImportPortExtra" binding="tns:ImportBindingExtra">
- <soap:address location="http://www.example.org/" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/ImportMe.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/ImportMe.wsdl
deleted file mode 100644
index d8899d1..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/ImportMe.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions name="ImportMe" targetNamespace="http://www.example.org/ImportMe/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/ImportMe/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
- <xsd:schema targetNamespace="http://www.example.org/ImportMe/">
- <xsd:element name="NewOperation">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="in" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="NewOperationResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="out" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="NewOperationResponse1">
- <xsd:complexType>
- <xsd:sequence>
-
- <xsd:element name="out" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="ImportMeMessageRequest">
- <wsdl:part element="tns:NewOperation" name="parameters"/>
- </wsdl:message>
- <wsdl:message name="ImportMeMessageResponse">
- <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
- </wsdl:message>
- <wsdl:message name="ImportMeMessageExtra">
- <wsdl:part name="NewPart" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="NewOperationRequest">
- <wsdl:part name="parameters" element="tns:NewOperation"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="NewOperationResponse">
- <wsdl:part name="parameters" element="tns:NewOperationResponse1"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="ImportMe">
- <wsdl:operation name="NewOperation">
- <wsdl:input message="tns:ImportMeMessageRequest"/>
- <wsdl:output message="tns:ImportMeMessageResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:portType name="ImportPortTypeExtra">
- <wsdl:operation name="NewOperation">
- <wsdl:input message="tns:NewOperationRequest"></wsdl:input>
- <wsdl:output message="tns:NewOperationResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="ImportMeSOAP" type="tns:ImportMe">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="NewOperation">
- <soap:operation soapAction="http://www.example.org/ImportMe/NewOperation"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="ImportBindingExtra"
- type="tns:ImportPortTypeExtra">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="NewOperation">
- <soap:operation
- soapAction="http://www.example.org/ImportMe/NewOperation" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="ImportMe">
- <wsdl:port binding="tns:ImportMeSOAP" name="ImportMeSOAP">
- <soap:address location="http://www.example.org/"/>
- </wsdl:port>
- </wsdl:service>
- <wsdl:service name="ImportServiceExtra">
- <wsdl:port name="ImportPortExtra" binding="tns:ImportBindingExtra">
- <soap:address location="http://www.example.org/" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl
deleted file mode 100644
index c5744b5..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions name="RemoveViaWSDL4J" targetNamespace="http://www.example.org/RemoveViaWSDL4J/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/RemoveViaWSDL4J/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl1="http://www.example.org/ImportMe/">
- <wsdl:import namespace="http://www.example.org/ImportMe/" location="ImportMe.wsdl"></wsdl:import>
- <wsdl:types>
- <xsd:schema targetNamespace="http://www.example.org/RemoveViaWSDL4J/">
- <xsd:element name="NewOperation">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="in" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="NewOperationResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="out" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="NewOperationResponse1">
- <xsd:complexType>
- <xsd:sequence>
-
- <xsd:element name="out" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="RemoveViaWSDL4JMessageRequest">
- <wsdl:part element="tns:NewOperation" name="parameters"/>
- </wsdl:message>
- <wsdl:message name="RemoveViaWSDL4JMessageResponse">
- <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
- </wsdl:message>
- <wsdl:message name="RemoveViaWSDL4JMessageExtra">
- <wsdl:part name="NewPart" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="NewOperationRequest">
- <wsdl:part name="parameters" element="tns:NewOperation"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="NewOperationResponse">
- <wsdl:part name="parameters" element="tns:NewOperationResponse1"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="RemoveViaWSDL4J">
- <wsdl:operation name="NewOperation">
- <wsdl:input message="tns:RemoveViaWSDL4JMessageRequest"/>
- <wsdl:output message="tns:RemoveViaWSDL4JMessageResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:portType name="MainPortTypeExtra">
- <wsdl:operation name="NewOperation">
- <wsdl:input message="tns:NewOperationRequest"></wsdl:input>
- <wsdl:output message="tns:NewOperationResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="RemoveViaWSDL4JSOAP" type="tns:RemoveViaWSDL4J">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="NewOperation">
- <soap:operation soapAction="http://www.example.org/RemoveViaWSDL4J/NewOperation"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="MainBindingExtra" type="tns:MainPortTypeExtra">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="NewOperation">
- <soap:operation
- soapAction="http://www.example.org/RemoveViaWSDL4J/NewOperation" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="RemoveViaWSDL4J">
- <wsdl:port binding="tns:RemoveViaWSDL4JSOAP" name="RemoveViaWSDL4JSOAP">
- <soap:address location="http://www.example.org/"/>
- </wsdl:port>
- </wsdl:service>
- <wsdl:service name="MainServiceExtra">
- <wsdl:port name="MainPortExtra" binding="tns:MainBindingExtra">
- <soap:address location="http://www.example.org/" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/BugFixesTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/BugFixesTest.java
index 0ba09f2..787898e 100644
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/BugFixesTest.java
+++ b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/BugFixesTest.java
@@ -16,7 +16,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.wsdl.OperationType;
import javax.wsdl.Port;
@@ -64,7 +63,6 @@
import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
import org.eclipse.wst.wsdl.util.WSDLConstants;
import org.eclipse.xsd.XSDElementDeclaration;
@@ -251,53 +249,6 @@
}
});
- suite.addTest(new BugFixesTest("RemoveBinding") //$NON-NLS-1$
- {
- protected void runTest()
- {
- testRemoveBinding();
- }
- });
-
- suite.addTest(new BugFixesTest("RemoveMessage") //$NON-NLS-1$
- {
- protected void runTest()
- {
- testRemoveMessage();
- }
- });
-
- suite.addTest(new BugFixesTest("RemovePortType") //$NON-NLS-1$
- {
- protected void runTest()
- {
- testRemovePortType();
- }
- });
-
- suite.addTest(new BugFixesTest("RemoveService") //$NON-NLS-1$
- {
- protected void runTest()
- {
- testRemoveService();
- }
- });
-
- suite.addTest(new BugFixesTest("GetWSDLType") //$NON-NLS-1$
- {
- protected void runTest()
- {
- testGetWSDLType();
- }
- });
-
- suite.addTest(new BugFixesTest("InvalidXSDImports") //$NON-NLS-1$
- {
- protected void runTest()
- {
- testInvalidXSDImports();
- }
- });
return suite;
}
@@ -626,263 +577,7 @@
assertSame(typesElement, secondChild);
}
-
- /**
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=245263
- */
- public void testRemoveMessage()
- {
- try
- {
- // load a wsdl that imports another wsdl
- Definition definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl", true); //$NON-NLS-1$
- String targetNamespace = definition.getTargetNamespace();
- String importedTargetNamespace = "http://www.example.org/ImportMe/"; //$NON-NLS-1$
- int totalMessages = 5;
- definition.updateElement();
-
- // make sure wsdl was loaded properly
- assertEquals("Initial messages were not properly loaded (checked via definition.getMessages())", totalMessages, definition.getMessages().size()); //$NON-NLS-1$
- assertEquals("Initial messages were not properly loaded (checked via definition.getEMessages())", totalMessages, definition.getEMessages().size()); //$NON-NLS-1$
- Element definitionElement = definition.getElement();
- NodeList messageElements = definitionElement.getElementsByTagNameNS(WSDLConstants.WSDL_NAMESPACE_URI, WSDLConstants.MESSAGE_ELEMENT_TAG);
- assertEquals("Initial messages were not properly loaded (checked via DOM)", totalMessages, messageElements.getLength()); //$NON-NLS-1$
-
- // make sure message we're going to remove currently exists
- QName messageQName = new QName(targetNamespace, "RemoveViaWSDL4JMessageExtra"); //$NON-NLS-1$
- javax.wsdl.Message message = definition.getMessage(messageQName);
- assertNotNull("Unable to find RemoveViaWSDL4JMessageExtra", message); //$NON-NLS-1$
-
- // remove the message
- javax.wsdl.Message removedMessage = definition.removeMessage(messageQName);
- assertEquals("Incorrect message removed", message, removedMessage); //$NON-NLS-1$
-
- // make sure message is gone
- javax.wsdl.Message nonexistMessage = definition.getMessage(messageQName);
- assertNull("RemoveViaWSDL4JMessageExtra still exists in model", nonexistMessage); //$NON-NLS-1$
-
- // make sure there is now 1 less message
- assertEquals("Message was not removed (checked via definition.getMessages())", totalMessages-1, definition.getMessages().size()); //$NON-NLS-1$
- assertEquals("Message was not removed (checked via definition.getEMessages())", totalMessages-1, definition.getEMessages().size()); //$NON-NLS-1$
- definitionElement = definition.getElement();
- messageElements = definitionElement.getElementsByTagNameNS(WSDLConstants.WSDL_NAMESPACE_URI, WSDLConstants.MESSAGE_ELEMENT_TAG);
- assertEquals("Message was not removed (checked via DOM)", totalMessages-1, messageElements.getLength()); //$NON-NLS-1$
-
- // make sure imported message we're going to remove currently exists
- messageQName = new QName(importedTargetNamespace, "ImportMeMessageExtra"); //$NON-NLS-1$
- message = definition.getMessage(messageQName);
- assertNotNull("Unable to find ImportMeMessageExtra", message); //$NON-NLS-1$
-
- // attempt to remove the imported message
- removedMessage = definition.removeMessage(messageQName);
- assertNull("ImportMeMessageExtra was incorrectly removed", removedMessage); //$NON-NLS-1$
-
- // make sure imported message still exists
- message = definition.getMessage(messageQName);
- assertNotNull("ImportMeMessageExtra no longer exists", message); //$NON-NLS-1$
-
- nonexistMessage = definition.removeMessage(new QName(targetNamespace, "doesntexist")); //$NON-NLS-1$
- assertNull("A non-existing message was removed", nonexistMessage); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail();
- }
- }
-
- /**
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=245263
- */
- public void testRemoveService()
- {
- try
- {
- // load a wsdl that imports another wsdl
- Definition definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl", true); //$NON-NLS-1$
- String targetNamespace = definition.getTargetNamespace();
- String importedTargetNamespace = "http://www.example.org/ImportMe/"; //$NON-NLS-1$
- int totalServices = 2;
- definition.updateElement();
-
- // make sure wsdl was loaded properly
- assertEquals("Initial services were not properly loaded (checked via definition.getServices())", totalServices, definition.getServices().size()); //$NON-NLS-1$
- assertEquals("Initial services were not properly loaded (checked via definition.getEServices())", totalServices, definition.getEServices().size()); //$NON-NLS-1$
- Element definitionElement = definition.getElement();
- NodeList serviceElements = definitionElement.getElementsByTagNameNS(WSDLConstants.WSDL_NAMESPACE_URI, WSDLConstants.SERVICE_ELEMENT_TAG);
- assertEquals("Initial services were not properly loaded (checked via DOM)", totalServices, serviceElements.getLength()); //$NON-NLS-1$
-
- // make sure service we're going to remove currently exists
- QName serviceQName = new QName(targetNamespace, "MainServiceExtra"); //$NON-NLS-1$
- javax.wsdl.Service service = definition.getService(serviceQName);
- assertNotNull("Unable to find MainServiceExtra", service); //$NON-NLS-1$
-
- // remove the service
- javax.wsdl.Service removedService = definition.removeService(serviceQName);
- assertEquals("Incorrect service removed", service, removedService); //$NON-NLS-1$
-
- // make sure service is gone
- javax.wsdl.Service nonexistService = definition.getService(serviceQName);
- assertNull("MainServiceExtra still exists in model", nonexistService); //$NON-NLS-1$
-
- // make sure there is now 1 less service
- assertEquals("Service was not removed (checked via definition.getServices())", totalServices-1, definition.getServices().size()); //$NON-NLS-1$
- assertEquals("Service was not removed (checked via definition.getEServices())", totalServices-1, definition.getEServices().size()); //$NON-NLS-1$
- definitionElement = definition.getElement();
- serviceElements = definitionElement.getElementsByTagNameNS(WSDLConstants.WSDL_NAMESPACE_URI, WSDLConstants.SERVICE_ELEMENT_TAG);
- assertEquals("Service was not removed (checked via DOM)", totalServices-1, serviceElements.getLength()); //$NON-NLS-1$
-
- // make sure imported service we're going to remove currently exists
- serviceQName = new QName(importedTargetNamespace, "ImportServiceExtra"); //$NON-NLS-1$
- service = definition.getService(serviceQName);
- assertNotNull("Unable to find ImportServiceExtra", service); //$NON-NLS-1$
-
- // attempt to remove the imported service
- removedService = definition.removeService(serviceQName);
- assertNull("ImportServiceExtra was incorrectly removed", removedService); //$NON-NLS-1$
-
- // make sure imported service still exists
- service = definition.getService(serviceQName);
- assertNotNull("ImportServiceExtra no longer exists", service); //$NON-NLS-1$
-
- nonexistService = definition.removeService(new QName(targetNamespace, "doesntexist")); //$NON-NLS-1$
- assertNull("A non-existing service was removed", nonexistService); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail();
- }
- }
-
- /**
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=245263
- */
- public void testRemoveBinding()
- {
- try
- {
- // load a wsdl that imports another wsdl
- Definition definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl", true); //$NON-NLS-1$
- String targetNamespace = definition.getTargetNamespace();
- String importedTargetNamespace = "http://www.example.org/ImportMe/"; //$NON-NLS-1$
- int totalBindings = 2;
- definition.updateElement();
-
- // make sure wsdl was loaded properly
- assertEquals("Initial bindings were not properly loaded (checked via definition.getBindings())", totalBindings, definition.getBindings().size()); //$NON-NLS-1$
- assertEquals("Initial bindings were not properly loaded (checked via definition.getEBindings())", totalBindings, definition.getEBindings().size()); //$NON-NLS-1$
- Element definitionElement = definition.getElement();
- NodeList bindingElements = definitionElement.getElementsByTagNameNS(WSDLConstants.WSDL_NAMESPACE_URI, WSDLConstants.BINDING_ELEMENT_TAG);
- assertEquals("Initial bindings were not properly loaded (checked via DOM)", totalBindings, bindingElements.getLength()); //$NON-NLS-1$
-
- // make sure binding we're going to remove currently exists
- QName bindingQName = new QName(targetNamespace, "MainBindingExtra"); //$NON-NLS-1$
- javax.wsdl.Binding binding = definition.getBinding(bindingQName);
- assertNotNull("Unable to find MainBindingExtra", binding); //$NON-NLS-1$
-
- // remove the binding
- javax.wsdl.Binding removedBinding = definition.removeBinding(bindingQName);
- assertEquals("Incorrect binding removed", binding, removedBinding); //$NON-NLS-1$
-
- // make sure binding is gone
- javax.wsdl.Binding nonexistBinding = definition.getBinding(bindingQName);
- assertNull("MainBindingExtra still exists in model", nonexistBinding); //$NON-NLS-1$
-
- // make sure there is now 1 less binding
- assertEquals("Binding was not removed (checked via definition.getBindings())", totalBindings-1, definition.getBindings().size()); //$NON-NLS-1$
- assertEquals("Binding was not removed (checked via definition.getEBindings())", totalBindings-1, definition.getEBindings().size()); //$NON-NLS-1$
- definitionElement = definition.getElement();
- bindingElements = definitionElement.getElementsByTagNameNS(WSDLConstants.WSDL_NAMESPACE_URI, WSDLConstants.BINDING_ELEMENT_TAG);
- assertEquals("Binding was not removed (checked via DOM)", totalBindings-1, bindingElements.getLength()); //$NON-NLS-1$
-
- // make sure imported binding we're going to remove currently exists
- bindingQName = new QName(importedTargetNamespace, "ImportBindingExtra"); //$NON-NLS-1$
- binding = definition.getBinding(bindingQName);
- assertNotNull("Unable to find ImportBindingExtra", binding); //$NON-NLS-1$
-
- // attempt to remove the imported binding
- removedBinding = definition.removeBinding(bindingQName);
- assertNull("ImportBindingExtra was incorrectly removed", removedBinding); //$NON-NLS-1$
-
- // make sure imported binding still exists
- binding = definition.getBinding(bindingQName);
- assertNotNull("ImportBindingExtra no longer exists", binding); //$NON-NLS-1$
-
- nonexistBinding = definition.removeBinding(new QName(targetNamespace, "doesntexist")); //$NON-NLS-1$
- assertNull("A non-existing binding was removed", nonexistBinding); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail();
- }
- }
-
- /**
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=245263
- */
- public void testRemovePortType()
- {
- try
- {
- // load a wsdl that imports another wsdl
- Definition definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl", true); //$NON-NLS-1$
- String targetNamespace = definition.getTargetNamespace();
- String importedTargetNamespace = "http://www.example.org/ImportMe/"; //$NON-NLS-1$
- int totalPortTypes = 2;
- definition.updateElement();
-
- // make sure wsdl was loaded properly
- assertEquals("Initial port types were not properly loaded (checked via definition.getPortTypes())", totalPortTypes, definition.getPortTypes().size()); //$NON-NLS-1$
- assertEquals("Initial port types were not properly loaded (checked via definition.getEPortTypes())", totalPortTypes, definition.getEPortTypes().size()); //$NON-NLS-1$
- Element definitionElement = definition.getElement();
- NodeList portTypeElements = definitionElement.getElementsByTagNameNS(WSDLConstants.WSDL_NAMESPACE_URI, WSDLConstants.PORT_TYPE_ELEMENT_TAG);
- assertEquals("Initial port types were not properly loaded (checked via DOM)", totalPortTypes, portTypeElements.getLength()); //$NON-NLS-1$
-
- // make sure port type we're going to remove currently exists
- QName portTypeQName = new QName(targetNamespace, "MainPortTypeExtra"); //$NON-NLS-1$
- javax.wsdl.PortType portType = definition.getPortType(portTypeQName);
- assertNotNull("Unable to find MainPortTypeExtra", portType); //$NON-NLS-1$
-
- // remove the portType
- javax.wsdl.PortType removedPortType = definition.removePortType(portTypeQName);
- assertEquals("Incorrect portType removed", portType, removedPortType); //$NON-NLS-1$
-
- // make sure portType is gone
- javax.wsdl.PortType nonexistPortType = definition.getPortType(portTypeQName);
- assertNull("MainPortTypeExtra still exists in model", nonexistPortType); //$NON-NLS-1$
-
- // make sure there is now 1 less portType
- assertEquals("PortType was not removed (checked via definition.getPortTypes())", totalPortTypes-1, definition.getPortTypes().size()); //$NON-NLS-1$
- assertEquals("PortType was not removed (checked via definition.getEPortTypes())", totalPortTypes-1, definition.getEPortTypes().size()); //$NON-NLS-1$
- definitionElement = definition.getElement();
- portTypeElements = definitionElement.getElementsByTagNameNS(WSDLConstants.WSDL_NAMESPACE_URI, WSDLConstants.PORT_TYPE_ELEMENT_TAG);
- assertEquals("PortType was not removed (checked via DOM)", totalPortTypes-1, portTypeElements.getLength()); //$NON-NLS-1$
-
- // make sure imported portType we're going to remove currently exists
- portTypeQName = new QName(importedTargetNamespace, "ImportPortTypeExtra"); //$NON-NLS-1$
- portType = definition.getPortType(portTypeQName);
- assertNotNull("Unable to find ImportPortTypeExtra", portType); //$NON-NLS-1$
-
- // attempt to remove the imported portType
- removedPortType = definition.removePortType(portTypeQName);
- assertNull("ImportPortTypeExtra was incorrectly removed", removedPortType); //$NON-NLS-1$
-
- // make sure imported portType still exists
- portType = definition.getPortType(portTypeQName);
- assertNotNull("ImportPortTypeExtra no longer exists", portType); //$NON-NLS-1$
-
- nonexistPortType = definition.removePortType(new QName(targetNamespace, "doesntexist")); //$NON-NLS-1$
- assertNull("A non-existing portType was removed", nonexistPortType); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail();
- }
- }
-
+
/**
* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=150553
*/
@@ -1564,111 +1259,4 @@
fail();
}
}
-
- /**
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=247296
- */
- public void testGetWSDLType()
- {
- try
- {
- // load a wsdl
- Definition definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/BugFixes/GetWSDLType/BadImport.wsdl", true); //$NON-NLS-1$
- definition.updateElement();
-
- // test all direct child elements of definition to make sure they are expected type
- Element definitionElement = definition.getElement();
- int type = WSDLUtil.getInstance().getWSDLType(definitionElement);
- assertEquals("Definition type incorrectly identified", WSDLConstants.DEFINITION, type); //$NON-NLS-1$
-
- NodeList childNodes = definitionElement.getChildNodes();
- Node n = childNodes.item(0);
- // skip over text node
- if (n.getNodeType() != Node.ELEMENT_NODE)
- n = n.getNextSibling();
- type = WSDLUtil.getInstance().getWSDLType((Element)n);
- assertEquals("Import type incorrectly identified", WSDLConstants.IMPORT, type); //$NON-NLS-1$
-
- n = n.getNextSibling();
- // skip over text node
- if (n.getNodeType() != Node.ELEMENT_NODE)
- n = n.getNextSibling();
- type = WSDLUtil.getInstance().getWSDLType((Element)n);
- assertEquals("xsd:import type incorrectly identified", -1, type); //$NON-NLS-1$
-
- n = n.getNextSibling();
- // skip over text node
- if (n.getNodeType() != Node.ELEMENT_NODE)
- n = n.getNextSibling();
- type = WSDLUtil.getInstance().getWSDLType((Element)n);
- assertEquals("Types type incorrectly identified", WSDLConstants.TYPES, type); //$NON-NLS-1$
-
- n = n.getNextSibling();
- // skip over text node
- if (n.getNodeType() != Node.ELEMENT_NODE)
- n = n.getNextSibling();
- type = WSDLUtil.getInstance().getWSDLType((Element)n);
- assertEquals("Message type incorrectly identified", WSDLConstants.MESSAGE, type); //$NON-NLS-1$
- n = n.getNextSibling();
-
- n = n.getNextSibling();
- // skip over text node
- if (n.getNodeType() != Node.ELEMENT_NODE)
- n = n.getNextSibling();
- type = WSDLUtil.getInstance().getWSDLType((Element)n);
- assertEquals("Message type incorrectly identified", WSDLConstants.MESSAGE, type); //$NON-NLS-1$
-
- n = n.getNextSibling();
- // skip over text node
- if (n.getNodeType() != Node.ELEMENT_NODE)
- n = n.getNextSibling();
- type = WSDLUtil.getInstance().getWSDLType((Element)n);
- assertEquals("Port type type incorrectly identified", WSDLConstants.PORT_TYPE, type); //$NON-NLS-1$
-
- n = n.getNextSibling();
- // skip over text node
- if (n.getNodeType() != Node.ELEMENT_NODE)
- n = n.getNextSibling();
- type = WSDLUtil.getInstance().getWSDLType((Element)n);
- assertEquals("Binding type incorrectly identified", WSDLConstants.BINDING, type); //$NON-NLS-1$
-
- n = n.getNextSibling();
- // skip over text node
- if (n.getNodeType() != Node.ELEMENT_NODE)
- n = n.getNextSibling();
- type = WSDLUtil.getInstance().getWSDLType((Element)n);
- assertEquals("Service type incorrectly identified", WSDLConstants.SERVICE, type); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail();
- }
- }
-
- /**
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=247296
- */
- public void testInvalidXSDImports()
- {
- try
- {
- // load a wsdl that contains an xsd:import outside of wsdl:types
- Definition definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/BugFixes/GetWSDLType/BadImport.wsdl", true); //$NON-NLS-1$
- String targetNamespace = definition.getTargetNamespace();
-
- // there should only be one valid wsdl:import
- Map imports = definition.getImports();
- assertEquals("Incorrect number of imports", 1, imports.size()); //$NON-NLS-1$
-
- // the bad xsd:import should be considered an extensibility element
- List extElements = definition.getExtensibilityElements();
- assertEquals("Incorrect number of extensibility elements", 1, extElements.size()); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail();
- }
- }
}
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/src/org/eclipse/wst/wsdl/ui/tests/internal/AllWSDLUITests.java b/tests/org.eclipse.wst.wsdl.ui.tests/src/org/eclipse/wst/wsdl/ui/tests/internal/AllWSDLUITests.java
index fb21d72..872464d 100644
--- a/tests/org.eclipse.wst.wsdl.ui.tests/src/org/eclipse/wst/wsdl/ui/tests/internal/AllWSDLUITests.java
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/src/org/eclipse/wst/wsdl/ui/tests/internal/AllWSDLUITests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,7 +40,5 @@
addTest(WSDLXMLNSCleanupTests.suite());
// Unused WSDL Imports
addTest(UnusedWSDLImportsTests.suite());
- // Misc bug fixes
- addTest(BugFixesTest.suite());
}
}
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/src/org/eclipse/wst/wsdl/ui/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.wsdl.ui.tests/src/org/eclipse/wst/wsdl/ui/tests/internal/BugFixesTest.java
deleted file mode 100644
index 50030fd..0000000
--- a/tests/org.eclipse.wst.wsdl.ui.tests/src/org/eclipse/wst/wsdl/ui/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.tests.internal;
-
-
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.util.XSDTypeSystemProvider;
-
-
-/**
- * Contains unit tests for reported bugs.
- */
-public class BugFixesTest extends BaseTestCase
-{
- public BugFixesTest(String name)
- {
- super(name);
- }
-
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(suite());
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite(BugFixesTest.class.getName());
-
- suite.addTest(new BugFixesTest("BuiltInTypes") //$NON-NLS-1$
- {
- protected void runTest()
- {
- testBuiltInTypes();
- }
- });
- return suite;
- }
-
- /**
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=243800
- */
- public void testBuiltInTypes()
- {
- try
- {
- Definition definition = getDefinition(TC_ROOT_FOLDER + "/BuiltInType/NewWSDLFile1.wsdl"); //$NON-NLS-1$
-
- XSDTypeSystemProvider provider = new XSDTypeSystemProvider();
- List types = provider.getBuiltInTypeNamesList(definition);
- assertTrue("Unable to find built in schema types", !types.isEmpty()); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
- }
- }
-}
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/BuiltInType/NewWSDLFile1.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/BuiltInType/NewWSDLFile1.wsdl
deleted file mode 100644
index 054a77d..0000000
--- a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/BuiltInType/NewWSDLFile1.wsdl
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="NewWSDLFile1"
- targetNamespace="http://www.example.org/NewWSDLFile1/" xmlns:tns="http://www.example.org/NewWSDLFile1/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:p="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/NewWSDLFile1/">
- <xsd:element name="op3">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="in" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="op3Response">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="out" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="op3Request">
- <wsdl:part name="parameters" element="tns:op3Response"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="op3Response">
- <wsdl:part name="parameters" element="tns:op3"></wsdl:part>
- <wsdl:part name="NewPart" type="p:string"></wsdl:part>
- <wsdl:part name="NewPart1" type="p:string"></wsdl:part>
- <wsdl:part name="NewPart2" type="p:string"></wsdl:part>
- <wsdl:part name="NewPart4" type="p:string"></wsdl:part>
-
- <wsdl:part name="NewPart3" type="p:string"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="p2">
- <wsdl:operation name="op3">
- <wsdl:input message="tns:op3Request" name="aaa"></wsdl:input>
- <wsdl:output message="tns:op3Response" name="bbb"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="b1" type="tns:p2">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="op3">
- <soap:operation soapAction="http://www.example.org/NewWSDLFile1/op3" />
- <wsdl:input name="aaa">
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output name="bbb">
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="s1">
- <wsdl:port name="NewPort" binding="tns:b1">
- <soap:address location="http://www.example.org/" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/BadImport.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Import001.wsdl
similarity index 67%
rename from tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/BadImport.wsdl
rename to tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Import001.wsdl
index 7a8a7d1..11b5a9d 100644
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/BadImport.wsdl
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Import001.wsdl
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/badwsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="badwsdl" targetNamespace="http://www.example.org/badwsdl/">
- <wsdl:import namespace="http://www.example.org/ImportMe/" location="ImportMe.wsdl"></wsdl:import>
- <xsd:import namespace="http://www.example.com/BadImport" schemaLocation="BadImport.xsd"></xsd:import>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/Import001/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Import001" targetNamespace="http://www.example.org/Import001/">
<wsdl:types>
- <xsd:schema targetNamespace="http://www.example.org/badwsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <xsd:schema targetNamespace="http://www.example.org/Import001/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:element name="NewOperation">
<xsd:complexType>
<xsd:sequence>
@@ -26,16 +24,16 @@
<wsdl:message name="NewOperationResponse">
<wsdl:part element="tns:NewOperationResponse" name="parameters"/>
</wsdl:message>
- <wsdl:portType name="badwsdl">
+ <wsdl:portType name="Import001">
<wsdl:operation name="NewOperation">
<wsdl:input message="tns:NewOperationRequest"/>
<wsdl:output message="tns:NewOperationResponse"/>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="badwsdlSOAP" type="tns:badwsdl">
+ <wsdl:binding name="Import001SOAP" type="tns:Import001">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="NewOperation">
- <soap:operation soapAction="http://www.example.org/badwsdl/NewOperation"/>
+ <soap:operation soapAction="http://www.example.org/Import001/NewOperation"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -44,8 +42,8 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="badwsdl">
- <wsdl:port binding="tns:badwsdlSOAP" name="badwsdlSOAP">
+ <wsdl:service name="Import001">
+ <wsdl:port binding="tns:Import001SOAP" name="Import001SOAP">
<soap:address location="http://www.example.org/"/>
</wsdl:port>
</wsdl:service>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main001.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main001.wsdl
new file mode 100644
index 0000000..8dae422
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main001.wsdl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/Main001/"
+ name="Main001"
+ targetNamespace="http://www.example.org/Main001/"
+ xmlns:wsdl1="http://www.example.org/Import001/">
+
+ <!-- Unused Import -->
+
+ <wsdl:import namespace="http://www.example.org/Import001/"
+ location="Import001.wsdl">
+ </wsdl:import>
+</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main002.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main002.wsdl
new file mode 100644
index 0000000..3a02092
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main002.wsdl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/Main002/"
+ name="Main002"
+ targetNamespace="http://www.example.org/Main002/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl1="http://www.example.org/Import001/">
+
+ <!-- Used Import -->
+
+ <wsdl:import namespace="http://www.example.org/Import001/"
+ location="Import001.wsdl">
+ </wsdl:import>
+
+ <wsdl:service name="MainService">
+ <wsdl:port name="NewPort" binding="wsdl1:Import001SOAP">
+ <soap:address location="http://www.example.org/"></soap:address>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main003.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main003.wsdl
new file mode 100644
index 0000000..2da602e
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main003.wsdl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns="http://www.example.org/Main003/"
+ name="Main003"
+ xmlns:wsdl1="http://www.example.org/Import001/"
+ targetNamespace="http://www.example.org/Main003/">
+
+ <!-- Unused Import -->
+
+ <wsdl:import namespace="http://www.example.org/Import001/"
+ location="Import001.wsdl">
+ </wsdl:import>
+</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main004.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main004.wsdl
new file mode 100644
index 0000000..df32b5f
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main004.wsdl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns="http://www.example.org/Main004/"
+ name="Main004"
+ targetNamespace="http://www.example.org/Main004/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl1="http://www.example.org/Import001/">
+
+ <!-- Used Import -->
+
+ <wsdl:import namespace="http://www.example.org/Import001/"
+ location="Import001.wsdl">
+ </wsdl:import>
+
+ <wsdl:service name="MainService">
+ <wsdl:port name="NewPort" binding="wsdl1:Import001SOAP">
+ <soap:address location="http://www.example.org/"></soap:address>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main005.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main005.wsdl
new file mode 100644
index 0000000..0ec13aa
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main005.wsdl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/Main005/"
+ name="Main005"
+ xmlns:wsdl1="http://www.example.org/Import001/"
+ targetNamespace="http://www.example.org/Main005/">
+
+ <!-- Unused Import -->
+
+ <import namespace="http://www.example.org/Import001/"
+ location="Import001.wsdl">
+ </import>
+</definitions>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main006.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main006.wsdl
new file mode 100644
index 0000000..21e20c5
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main006.wsdl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/Main006/"
+ name="Main006"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl1="http://www.example.org/Import001/"
+ targetNamespace="http://www.example.org/Main006/">
+
+ <!-- Used Import -->
+
+ <import namespace="http://www.example.org/Import001/"
+ location="Import001.wsdl">
+ </import>
+
+ <service name="MainService">
+ <port name="NewPort" binding="wsdl1:Import001SOAP">
+ <soap:address location="http://www.example.org/"></soap:address>
+ </port>
+ </service>
+</definitions>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main007.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main007.wsdl
new file mode 100644
index 0000000..e166b4a
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main007.wsdl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/Main007/"
+ name="Main007"
+ targetNamespace="http://www.example.org/Main007/"
+ xmlns="http://www.example.org/Import001/">
+
+ <!-- Unused Import -->
+
+ <wsdl:import namespace="http://www.example.org/Import001/"
+ location="Import001.wsdl">
+ </wsdl:import>
+</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main008.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main008.wsdl
new file mode 100644
index 0000000..55070dc
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main008.wsdl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/Main007/"
+ name="Main007"
+ targetNamespace="http://www.example.org/Main007/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://www.example.org/Import001/">
+
+ <!-- Used Import -->
+
+ <wsdl:import namespace="http://www.example.org/Import001/"
+ location="Import001.wsdl">
+ </wsdl:import>
+
+ <wsdl:service name="MainService">
+ <wsdl:port name="NewPort" binding="Import001SOAP">
+ <soap:address location="http://www.example.org/"></soap:address>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main009.wsdl b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main009.wsdl
new file mode 100644
index 0000000..e0cbf06
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.ui.tests/testresources/WSDL/WSDLImports/Core/Main009.wsdl
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/Main009/"
+ name="Main009"
+ targetNamespace="http://www.example.org/Main009/">
+
+ <!-- Unused Invalid Import -->
+
+ <wsdl:import namespace="http://www.example.org/FileNotFound/"
+ location="WSDLFileNotFound.wsdl">
+ </wsdl:import>
+</wsdl:definitions>
