This commit was manufactured by cvs2svn to create tag 'v201003082353'.
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project
deleted file mode 100644
index e59b69c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.consumption.core</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/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7894f8b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:52 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 55d6472..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.core;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.core.commands;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 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
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties
deleted file mode 100644
index 35664a5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties
+++ /dev/null
@@ -1,50 +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
-# Shane Clarke - Apache CXF support
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/src/packagename/myService.java
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!-- Service.RuntimeId - ID of web service runtime
-Service.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.60
-!-- 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=serviceEarProjectName
-
-!-- Generate a client mainline using JAX-WS APIs
-!--GenClient=false
-!-- Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!-- Specify to generate the wrapper and fault beans
-!--GenWrapperFaultBeans=true
-!-- Specify to generate the WSDL file
-!--GenWSDL=true
-!-- Output schemas to separate files and use imports to load them instead of inlining them into the wsdl
-!--GenXSDImports=true
-!--Specifies that the generated WSDL is to include a SOAP 1.2 binding
-!--UseSOAP12Binding=false
-!--Set the name of the generated WSDL file
-!--WsdlFileName=myWSDLFileName.wsdl
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml
deleted file mode 100644
index 1d5f8b8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_bujava.properties"/>
-
-<echo message="calling the web services generation ant task: cxf_bujava"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties
deleted file mode 100644
index 90292ce..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties
+++ /dev/null
@@ -1,89 +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
-# Shane Clarke - Apache CXF support
-###############################################################################
-!--ScenarioType REQUIRED. Differentiates from "service" scenario.
-ScenarioType=client
-
-!--InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java.
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list values for the following properties:
-!-- Client.RuntimeId, Client.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!--Client.RuntimeId - ID of web service runtime
-Client.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!--Client.ServerId - ID of target server
-Client.ServerId=org.eclipse.jst.server.tomcat.60
-
-!--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
-!--ClientProjectName=clientProjectName
-
-!--ClientEarProjectName- name of Client EAR project - set only if applicable for selected server type
-!--ClientEarProjectName=clientEARProjectName
-
-!--ClientComponentType - type of Client project
-!--ClientComponentType=template.cxf.core
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!--Generate Client : REQUIRED
-GenClient=true
-
-!--Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!--Generate starting point code for an implementation object
-!--GenImpl=true
-!--Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-!--DefaultValues=true
-!--Enables or disables processing of extended soap header message binding
-!--ExtSOAPHeaders=false
-!--Enables or disables loading of the default namespace package name mapping
-!--DefaultNamespace=true
-!--Enables or disables loading of the default excludes namespace mapping
-!--DefaultExcludesNamespace=true
-!--Enable Auto Name Resolution
-!--AutoNameResolution=false
-
-!--Specify the name of the WSDL service for which code is to be generated. The default is to generate code for every service in the WSDL document
-!--ServiceName=myService
-
-!--XJC Args: Specify the arguments to be passed directly to the XJC
-
-!--Initialise fields mapped from elements with their default values
-!--xjc_dv=false
-!--Activate plugin to add a toString() method to generated classes
-!--xjc_ts=false
-!--Have toString produce multi line output
-!--xjc_ts_multi=false
-!--Have toString produce single line terse output
-!--xjc_ts_simple=false
-!--Enable source location support for generated code
-!--xjc_locator=false
-!--Generate accessor methods with the 'synchronized' keyword
-!--xjc_sync_methods=false
-!--Add @Generated annotations to the generated code
-!--xjc_mark_generated=false
-
-!-- Mappings
-!-- Top down scenario. Workspace relative URI to property file containing mappings.
-!-- 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
-!--Mappings=/dynamicWebProjectName/mappings.txt
-
-!--Binding Files. Comma delimited string of absolute paths in the local file system of JAXWS or JAXB binding files.
-!--Bindings=C:/workspace1/dynamicWebProjectName/binding1.xml,C:/workspace1/dynamicWebProjectName/binding2.xml
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml
deleted file mode 100644
index 2d3a566..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_client.properties"/>
-
-<echo message="calling the web services generation ant task: cxf_client"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties
deleted file mode 100644
index 8e6e887..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties
+++ /dev/null
@@ -1,83 +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
-# Shane Clarke - Apache CXF support
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!-- Service.RuntimeId - ID of web service runtime
-Service.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.60
-!-- 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=serviceEarProjectName
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!--Specify the name of the WSDL service for which code is to be generated. The default is to generate code for every service in the WSDL document
-!--ServiceName=myService
-
-!--Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!--Generate starting point code for an implementation object
-!--GenImpl=true
-!--Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-!--DefaultValues=true
-!--Enables or disables processing of extended soap header message binding
-!--ExtSOAPHeaders=false
-!--Enables or disables loading of the default namespace package name mapping
-!--DefaultNamespace=true
-!--Enables or disables loading of the default excludes namespace mapping
-!--DefaultExcludesNamespace=true
-!--Enable Auto Name Resolution
-!--AutoNameResolution=false
-
-!--XJC Args: Specify the arguments to be passed directly to the XJC
-
-!--Initialise fields mapped from elements with their default values
-!--xjc_dv=false
-!--Activate plugin to add a toString() method to generated classes
-!--xjc_ts=false
-!--Have toString produce multi line output
-!--xjc_ts_multi=false
-!--Have toString produce single line terse output
-!--xjc_ts_simple=false
-!--Enable source location support for generated code
-!--xjc_locator=false
-!--Generate accessor methods with the 'synchronized' keyword
-!--xjc_sync_methods=false
-!--Add @Generated annotations to the generated code
-!--xjc_mark_generated=false
-
-!-- Mappings
-!-- Top down scenario. Workspace relative URI to property file containing mappings.
-!-- 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
-!--Mappings=/dynamicWebProjectName/mappings.txt
-
-!--Binding Files. Comma delimited string of absolute paths in the local file system of JAXWS or JAXB binding files.
-!--Bindings=C:/workspace1/dynamicWebProjectName/binding1.xml,C:/workspace1/dynamicWebProjectName/binding2.xml
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml
deleted file mode 100644
index 2c79c6b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_tdjava.properties"/>
-
-<echo message="calling the web services generation ant task: cxf_tdjava"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
deleted file mode 100644
index d0ad5cd..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- .,\
- plugin.properties,\
- plugin.xml,\
- ant/
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
deleted file mode 100644
index c25f6ca..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-WEB_SERVICE_LOCATOR_CXF=Apache CXF Web Service Locator
-WEB_SERVICE_LOCATOR_CATEGORY_CXF=Apache CXF Components
-
-LABEL_RUNTIME_CXF=Apache CXF
-LABEL_BOTTOM_UP_JAVA_BEAN=Bottom up Java bean Web Service
-LABEL_TOP_DOWN_JAVA_BEAN=Top down Java bean Web Service
-LABEL_CLIENT=Client
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
deleted file mode 100644
index 2137477..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.wst.ws.locator">
- <webServiceLocatorCategory
- id="ws.locator.category.cxf"
- label="%WEB_SERVICE_LOCATOR_CATEGORY_CXF"/>
-
- <webServiceLocator
- class="org.eclipse.jst.ws.internal.cxf.consumption.core.locator.CXFWebServiceLocator"
- id="ws.locator.cxf"
- category="ws.locator.category.cxf"
- label="%WEB_SERVICE_LOCATOR_CXF">
- </webServiceLocator>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.antfiles">
- <antfiles
- id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTBUJava"
- runtimeid="cxf"
- pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
- path="ant/cxf_bujava.properties"
- wsgenpath="ant/cxf_bujava.xml"
- runtimelabel="%LABEL_RUNTIME_CXF"
- scenariolabel="%LABEL_BOTTOM_UP_JAVA_BEAN">
- </antfiles>
- <antfiles
- id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTTopJava"
- runtimeid="cxf"
- pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
- path="ant/cxf_tdjava.properties"
- wsgenpath="ant/cxf_tdjava.xml"
- runtimelabel="%LABEL_RUNTIME_CXF"
- scenariolabel="%LABEL_TOP_DOWN_JAVA_BEAN">
- </antfiles>
- <antfiles
- id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTZClient"
- runtimeid="cxf"
- pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
- path="ant/cxf_client.properties"
- wsgenpath="ant/cxf_client.xml"
- runtimelabel="%LABEL_RUNTIME_CXF"
- scenariolabel="%LABEL_CLIENT">
- </antfiles>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
deleted file mode 100644
index 63eb001..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFConsumptionCoreMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCoreMessages"; //$NON-NLS-1$
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(CXFConsumptionCoreMessages.BUNDLE_NAME, CXFConsumptionCoreMessages.class);
- }
-
- private CXFConsumptionCoreMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties
deleted file mode 100644
index 5d980bc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
deleted file mode 100644
index e920fe6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- *
- */
-public class CXFConsumptionCorePlugin extends AbstractUIPlugin {
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.core"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFConsumptionCorePlugin plugin;
-
- /**
- * The constructor.
- */
- public CXFConsumptionCorePlugin() {
- }
-
- /**
- * Returns the shared instance.
- *
- * @return the shared instance
- */
- public static CXFConsumptionCorePlugin getDefault() {
- return plugin;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- public static void logMessage(int severity, String message) {
- CXFConsumptionCorePlugin.log(new Status(severity, CXFConsumptionCorePlugin.PLUGIN_ID,
- message));
- }
-
- public static void log(IStatus status) {
- CXFConsumptionCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFConsumptionCorePlugin.log(new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java
deleted file mode 100644
index 0525ff5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CommandLineUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Executes the <code>org.apache.cxf.tools.wsdlto.WSDLToJava</code> command with the arguments
- * necessary to generate a client.
- *
- */
-public class WSDL2JavaClientCommand extends AbstractDataModelOperation {
- public static final String CXF_TOOL_CLASS_NAME = "org.apache.cxf.tools.wsdlto.WSDLToJava"; //$NON-NLS-1$
-
- private WSDL2JavaDataModel model;
-
- private JavaResourceChangeListener javaResourceChangeListener;
-
- /**
- * Constructs a <code>WSDL2JavaClientCommand</code> object.
- * @param model the <code>WSDL2JavaDataModel</code> used to pass information
- * between commands.
- */
- public WSDL2JavaClientCommand(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- javaResourceChangeListener = new JavaResourceChangeListener(new Path(model.getJavaSourceFolder()));
- ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
- IResourceChangeEvent.POST_CHANGE);
-
- String[] progArgs = CommandLineUtils.getWSDL2JavaGenerateClientArguments(model);
-
- try {
- String projectName = model.getProjectName();
-
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- LaunchUtils.launch(javaProject, WSDL2JavaClientCommand.CXF_TOOL_CLASS_NAME, progArgs);
- FileUtils.copyW2JFilesFromTmp(this.model);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFConsumptionCorePlugin.log(status);
- }
-
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
- return status;
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- List<IResource> changedResources = new ArrayList<IResource>();
- changedResources.addAll(javaResourceChangeListener.getChangedResources());
- if (changedResources.size() > 0) {
- for (IResource resource : changedResources) {
- try {
- resource.delete(true, monitor);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFConsumptionCorePlugin.log(status);
- }
- }
- }
- return status;
- }
-
- //ANT Environment Mappings
- public void setJavaSourceFolder(String javaSourceFolder) {
- model.setJavaSourceFolder(javaSourceFolder);
- }
-
- public void setServiceName(String serviceName) {
- model.setServiceName(serviceName);
- }
-
- public void setGenerateServer(boolean generateServer) {
- model.setGenerateServer(generateServer);
- }
-
- public void setGenerateClient(boolean generateClient) {
- model.setGenerateClient(generateClient);
- }
-
- public void setGenerateImplementation(boolean generateImplementation) {
- model.setGenerateImplementation(generateImplementation);
- }
-
- public void setUseDefaultValues(boolean useDefaultValues) {
- model.setUseDefaultValues(useDefaultValues);
- }
-
- public void setProcessSOAPHeaders(boolean processSOAPHeaders) {
- model.setProcessSOAPHeaders(processSOAPHeaders);
- }
-
- public void setLoadDefaultNamespacePackageNameMapping(boolean loadDefaultNamespacePackageNameMapping) {
- model.setLoadDefaultNamespacePackageNameMapping(loadDefaultNamespacePackageNameMapping);
- }
-
- public void setLoadDefaultExcludesNamepsaceMapping(boolean loadDefaultExcludesNamepsaceMapping) {
- model.setLoadDefaultExcludesNamepsaceMapping(loadDefaultExcludesNamepsaceMapping);
- }
-
- public void setAutoNameResolution(boolean autoNameResolution) {
- model.setAutoNameResolution(autoNameResolution);
- }
-
- public void setXjcUseDefaultValues(boolean xjcUseDefaultValues) {
- model.setXjcUseDefaultValues(xjcUseDefaultValues);
- }
-
- public void setXjcToString(boolean xjcToString) {
- model.setXjcToStringSimple(xjcToString);
- }
-
- public void setXjcToStringSimple(boolean xjcToStringSimple) {
- model.setXjcToStringSimple(xjcToStringSimple);
- }
-
- public void setXjcToStringMultiLine(boolean xjcToStringMultiLine) {
- model.setXjcToStringMultiLine(xjcToStringMultiLine);
- }
-
- public void setXjcLocator(boolean xjcLocator) {
- model.setXjcLocator(xjcLocator);
- }
-
- public void setXjcSyncMethods(boolean xjcSyncMethods) {
- model.setXjcSyncMethods(xjcSyncMethods);
- }
-
- public void setXjcMarkGenerated(boolean xjcMarkGenerated) {
- model.setXjcMarkGenerated(xjcMarkGenerated);
- }
-
- @SuppressWarnings("unchecked")
- public void setIncludedNamespaces(Map value) {
- model.setIncludedNamespaces(value);
- }
-
- public void setBindingFiles(List<String> bindingFiles) {
- for (String path : bindingFiles) {
- model.getBindingFiles().add(path);
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java
deleted file mode 100644
index f0b4800..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.commands;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Loads the <code>WSDL2JavaDataModel</code> with the persisted defaults
- * from the preferences and with the initial runtime information such as the
- * starting point WSDL URL.
- *
- */
-public class WSDL2JavaClientDefaultingCommand extends AbstractDataModelOperation {
- private WSDL2JavaDataModel model;
- private String projectName;
- private String inputURL;
-
- /**
- * Constructs a WSDL2JavaClientDefaultingCommand object.
- * @param model the <code>WSDL2JavaDataModel</code> used to pass information
- * between commands.
- */
- public WSDL2JavaClientDefaultingCommand(WSDL2JavaDataModel model, String projectName, String inputURL) {
- this.model = model;
- this.projectName = projectName;
- this.inputURL = inputURL;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- WSDL2JavaPersistentContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- model.setDefaultRuntimeVersion(context.getDefaultRuntimeVersion());
- model.setDefaultRuntimeType(context.getDefaultRuntimeType());
- model.setProjectName(projectName);
-
- model.setIncludedNamespaces(new HashMap<String, String>());
- model.setExcludedNamespaces(new HashMap<String, String>());
-
- // XJC
- model.setXjcUseDefaultValues(context.isXjcUseDefaultValues());
- model.setXjcToString(context.isXjcToString());
- model.setXjcToStringMultiLine(context.isXjcToStringMultiLine());
- model.setXjcToStringSimple(context.isXjcToStringSimple());
- model.setXjcLocator(context.isXjcLocator());
- model.setXjcSyncMethods(context.isXjcSyncMethods());
- model.setXjcMarkGenerated(context.isXjcMarkGenerated());
-
- model.setValidate(context.isValidate());
- model.setProcessSOAPHeaders(context.isProcessSOAPHeaders());
- model.setLoadDefaultExcludesNamepsaceMapping(context.isLoadDefaultExcludesNamepsaceMapping());
- model.setLoadDefaultNamespacePackageNameMapping(context.isLoadDefaultNamespacePackageNameMapping());
- model.setUseDefaultValues(context.isUseDefaultValues());
- model.setNoAddressBinding(context.isNoAddressBinding());
- model.setAutoNameResolution(context.isAutoNameResolution());
-
- model.setJavaSourceFolder(JDTUtils.getJavaProjectSourceDirectoryPath(model.getProjectName()).toOSString());
-
- try {
- URL wsdlUrl = new URL(inputURL);
- model.setWsdlURL(wsdlUrl);
-
- Definition definition = WSDLUtils.readWSDL(model.getWsdlURL());
- if (definition != null) {
- String targetNamespace = definition.getTargetNamespace();
- String packageName = WSDLUtils.getPackageNameFromNamespace(targetNamespace);
- model.setTargetNamespace(targetNamespace);
- model.getIncludedNamespaces().put(targetNamespace, packageName);
-
- String wsdlLocation = WSDLUtils.getWSDLLocation(definition);
- if (wsdlLocation != null) {
- model.setWsdlLocation(wsdlLocation);
- }
-
- model.setWsdlDefinition(definition);
- }
-
- } catch (MalformedURLException murle) {
- status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- murle.getLocalizedMessage());
- CXFConsumptionCorePlugin.log(status);
- } catch (IOException ioe) {
- status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- ioe.getLocalizedMessage());
- CXFConsumptionCorePlugin.log(status);
- }
- return status;
- }
-
- public WSDL2JavaDataModel getWSDL2JavaDataModel() {
- return model;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java
deleted file mode 100644
index a150dea..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.locator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator;
-
-@SuppressWarnings("restriction")
-public class CXFWebServiceLocator extends AbstractWebServiceLocator {
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServiceClients(IProgressMonitor monitor) {
- return super.getWebServiceClients(monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServiceClients(IProject[] projects, IProgressMonitor monitor) {
- return super.getWebServiceClients(projects, monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServices(IProgressMonitor monitor) {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- return getWebServices(projects, monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServices(IProject[] projects, IProgressMonitor monitor) {
- List webServices = new ArrayList();
- for (IProject project : projects) {
- if (J2EEUtils.isWebComponent(project)) {
- webServices.addAll(getWebServicesFromProject(project));
- }
- }
- return webServices;
- }
-
- @SuppressWarnings("unchecked")
- private List getWebServicesFromProject(IProject project) {
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
deleted file mode 100644
index f8721ed..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.consumption.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fc358c6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:53 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index cc21552..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws.cxf.consumption.core;bundle-version="0.3.4",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jst.ws.cxf.ui;bundle-version="0.3.5",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 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
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- .,\
- plugin.properties,\
- plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
deleted file mode 100644
index 5ade88b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-JAXWS_WEBSERVICETYPE=POJO Web Service
-
-JAXWS_CLIENT=JAX-WS Stub
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
deleted file mode 100644
index 29981a1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.cxf.wsImpl.java"
- label="%JAXWS_WEBSERVICETYPE"
- resourceTypeMetadata="File IResource CompilationUnit"
- extensionMetadata=".java .class"
- objectSelectionWidget="org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
- mergerClass="org.eclipse.jst.ws.internal.consumption.common.JavaMerger">
- </webServiceImpl>
- </extension>
-
- <!--<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
- <webServiceClientImpl
- id="org.eclipse.jst.ws.cxf.client.type.java"
- label="%JAXWS_CLIENT">
- </webServiceClientImpl>
- </extension>-->
-
- <extension point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class=" org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.CXFJAXWSSelectionLaunchable"
- external_modify="true"
- id=" org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object.JAXWSSelectionTransformer">
- </objectSelectionWidget>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- class="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.WSDL2JavaClientConfigWidgetFactory"
- id="WSDL2JavaClientConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand">
- </widgetFactory>
- </extension>
-
- <!-- WSDL2Java -->
- <extension point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="IncludedNamespaces"
- transform="org.eclipse.jst.ws.internal.cxf.core.env.ant.MappingsTransformer"/>
- <map
- key="Bindings"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="BindingFiles"
- transform="org.eclipse.jst.ws.internal.cxf.core.env.ant.BindingsTransformer"/>
- <map
- key="JavaOutput"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="JavaSourceFolder"/>
- <map
- key="ServiceName"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="ServiceName"/>
- <map
- key="GenClient"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="GenerateClient"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="GenServer"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="GenerateServer"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="GenImpl"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="GenerateImplementation"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="DefaultValues"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="UseDefaultValues"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="ExtSOAPHeaders"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="ProcessSOAPHeaders"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="DefaultNamespace"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="LoadDefaultNamespacePackageNameMapping"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="DefaultExcludesNamespace"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="LoadDefaultExcludesNamepsaceMapping"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="AutoNameResolution"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="AutoNameResolution"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_dv"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcUseDefaultValues"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_ts"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcToString"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_ts_multi"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcToStringMultiLine"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_ts_simple"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcToStringSimple"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_locator"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcLocator"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_sync_methods"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcSyncMethods"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_mark_generated"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcMarkGenerated"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- </extension>
- </plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
deleted file mode 100644
index 5f847b8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFConsumptionUIMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages"; //$NON-NLS-1$
- public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE;
- public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE;
-
- public static String WSDL2JAVA_CLIENT_PAGE_TITLE;
- public static String WSDL2JAVA_CLIENT_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE;
- public static String WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_GROUP_LABEL;
- public static String WSDL2JAVA_XJC_ARG_GROUP_LABEL;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(CXFConsumptionUIMessages.BUNDLE_NAME, CXFConsumptionUIMessages.class);
- }
-
- private CXFConsumptionUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
deleted file mode 100644
index 9406b55..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE=Browse Workspace Classes and Interfaces
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE=Select the Java Class or Interface which will be used to create the Web Service
-
-#WSDL2Java Client Congih Widget Factory
-WSDL2JAVA_CLIENT_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-#WSDL2Java Client Defaults Config Widget
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options
-WSDL2JAVA_XJC_ARG_GROUP_LABEL=XJC Arguments
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
deleted file mode 100644
index 269b5e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- */
-public class CXFConsumptionUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFConsumptionUIPlugin plugin;
-
- /**
- * The constructor
- */
- public CXFConsumptionUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static CXFConsumptionUIPlugin getDefault() {
- return plugin;
- }
-
- public static void logMessage(int severity, String message) {
- CXFConsumptionUIPlugin.log(new Status(severity, CXFConsumptionUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFConsumptionUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFConsumptionUIPlugin.log(new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
deleted file mode 100644
index 053d1d9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.AbstractObjectSelectionLaunchable;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-@SuppressWarnings("restriction")
-public class CXFJAXWSSelectionLaunchable extends AbstractObjectSelectionLaunchable {
- private IStatus validationStatus = Status.OK_STATUS;
-
- private IProject project;
- private String serverComponentName;
- private String className = "";
-
- @Override
- public void setInitialSelection(IStructuredSelection initialSelection) {
- if (initialSelection != null && !initialSelection.isEmpty()) {
- Object firstElement = initialSelection.getFirstElement();
- if (firstElement instanceof String) {
- className = firstElement.toString();
- }
- }
- }
-
- @Override
- public int launch(Shell shell) {
- IStatus status = Status.OK_STATUS;
- ElementTreeSelectionDialog selectionDialog = new ElementTreeSelectionDialog(shell,
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- selectionDialog.setTitle(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE);
- selectionDialog
- .setMessage(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE);
- selectionDialog.setAllowMultiple(false);
- selectionDialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- selectionDialog.addFilter(new JavaViewerFilter());
-
- selectionDialog.setValidator(new JavaSelectionStatusValidator());
-
- int returnCode = selectionDialog.open();
- if (returnCode == Window.OK) {
- ICompilationUnit selectedCompilationUnit = (ICompilationUnit) selectionDialog.getFirstResult();
- IType type = selectedCompilationUnit.findPrimaryType();
- className = type.getFullyQualifiedName();
- try {
- IResource typeResource = type.getUnderlyingResource();
- if (typeResource != null) {
- this.project = typeResource.getProject();
- IVirtualComponent comp = ResourceUtils.getComponentOf(typeResource);
- if (comp != null) {
- serverComponentName = comp.getName();
- }
- } else {
- project = null;
- serverComponentName = null;
- }
- return status.getSeverity();
- } catch (JavaModelException jme) {
- project = null;
- serverComponentName = null;
- status = jme.getStatus();
- CXFConsumptionUIPlugin.log(status);
- return status.getSeverity();
- }
- }
-
- return IStatus.CANCEL;
- }
-
- @Override
- public IStructuredSelection getObjectSelection() {
- return new StructuredSelection(className);
- }
-
- public String getComponentName() {
- return serverComponentName;
- }
-
- public IProject getProject() {
- ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getSelectionService();
- ISelection selection = selectionService.getSelection();
-
- if (selection != null && !selection.isEmpty() && selection instanceof TreeSelection) {
- TreeSelection treeSelection = (TreeSelection) selection;
- Object firstElement = treeSelection.getFirstElement();
- if (firstElement instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) firstElement;
- project = compilationUnit.getResource().getProject();
- }
- }
- return project;
- }
-
- @Override
- public IStatus validateSelection(IStructuredSelection objectSelection) {
- return validationStatus;
- }
-
- @Override
- public String getObjectSelectionDisplayableString() {
- return className;
- }
-
- @Override
- public boolean validate(String stringToValidate) {
- className = stringToValidate;
-
- IProject project = getProject();
- if (project != null) {
- validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
- } else {
- validationStatus = JDTUtils.validateJavaTypeName(className);
- }
-
-// IProject project = getProject();
-// if (project != null) {
-// IType type = JDTUtils.getType(project, className);
-// if (type == null || !type.exists()) {
-// validationStatus = new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, "");
-// } else {
-// validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
-// }
-// return validationStatus.isOK();
-// }
- return validationStatus.isOK();
- }
-
- private static class JavaViewerFilter extends ViewerFilter {
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- try {
- if (element instanceof IJavaProject) {
- return true;
- }
- if (element instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
- return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
- }
- if (element instanceof IPackageFragment) {
- IPackageFragment packageFragment = (IPackageFragment) element;
- return packageFragment.hasChildren();
- }
- if (element instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType type = compilationUnit.findPrimaryType();
- return type.isClass() || type.isInterface();
-
- }
- } catch (JavaModelException jme) {
- CXFConsumptionUIPlugin.log(jme.getStatus());
- }
- return false;
- }
- }
-
- private static class JavaSelectionStatusValidator implements ISelectionStatusValidator {
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- return new Status(IStatus.OK, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
- return new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
deleted file mode 100644
index 0494f83..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameEditingSupport;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameTableContentProvider;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidget extends SimpleWidgetDataContributor {
- private IStatus status = Status.OK_STATUS;
- private Listener statusListener;
-
- private WSDL2JavaDataModel model;
-
- private Composite namespaceCompositeHolder;
- private Composite namespaceComposite;
- private int namespaceCompositeHeight = -1;
-
- public WSDL2JavaClientConfigWidget() {
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- this.statusListener = statusListener;
-
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(3, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- // Output Dir
- WSDL2JavaWidgetFactory.createOutputDirectoryLabel(mainComposite);
-
- Combo outputDirCombo = WSDL2JavaWidgetFactory.createOutputDirectoryCombo(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- outputDirCombo.setLayoutData(gridData);
-
- // Package Name:
- WSDL2JavaWidgetFactory.createPackageNameLabel(mainComposite);
-
- final Text packageNameText = WSDL2JavaWidgetFactory.createPackageNameText(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- packageNameText.setLayoutData(gridData);
-
- packageNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String packageName = packageNameText.getText();
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName);
- statusListener.handleEvent(null);
- }
- });
-
- final Button namespaceMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 3;
- namespaceMappingButton.setLayoutData(gridData);
- namespaceMappingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (namespaceMappingButton.getSelection()) {
- if (namespaceComposite == null) {
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 7;
- namespaceCompositeHolder.setLayoutData(gridData);
- namespaceCompositeHolder.pack();
-
- namespaceComposite = getNamespaceMappingComposite(namespaceCompositeHolder);
- if (namespaceCompositeHeight == -1) {
- Point groupSize = namespaceComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
- namespaceCompositeHeight = groupSize.y;
- }
- Shell shell = parent.getShell();
- Point shellSize = shell.getSize();
- shell.setSize(shellSize.x, shellSize.y + namespaceCompositeHeight);
-
- namespaceCompositeHolder.layout();
- }
- } else {
- if (namespaceComposite != null) {
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- namespaceCompositeHolder.setLayoutData(gridData);
- namespaceCompositeHolder.pack();
- namespaceComposite.dispose();
- namespaceComposite = null;
- namespaceCompositeHolder.layout();
- Shell shell = parent.getShell();
- Point shellSize = shell.getSize();
- shell.setSize(shellSize.x, shellSize.y - namespaceCompositeHeight);
- }
- }
- }
- });
-
- namespaceCompositeHolder = new Composite(mainComposite, SWT.NONE);
- gridLayout = new GridLayout(1, true);
- namespaceCompositeHolder.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- namespaceCompositeHolder.setLayoutData(gridData);
-
- // Service Name:
- // WSDL2JavaWidgetFactory.createServiceNameLabel(mainComposite);
- //
- // Combo serviceNameCombo = WSDL2JavaWidgetFactory.createServiceNameCombo(mainComposite, model);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // gridData.horizontalSpan = 2;
- // serviceNameCombo.setLayoutData(gridData);
-
- Label bindingFilesLabel = WSDL2JavaWidgetFactory.createBindingFilesLabel(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.verticalSpan = 3;
- bindingFilesLabel.setLayoutData(gridData);
-
- List bindingFilesList = WSDL2JavaWidgetFactory.createBindingFilesList(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.verticalSpan = 3;
- bindingFilesList.setLayoutData(gridData);
-
- Button addBindingFileButton = WSDL2JavaWidgetFactory.createAddBindingFileButton(mainComposite, model,
- bindingFilesList);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- addBindingFileButton.setLayoutData(gridData);
-
- Button removeBindingFileButton = WSDL2JavaWidgetFactory.createRemoveBindingFileButton(mainComposite,
- model, bindingFilesList);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- removeBindingFileButton.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createPaddingLabel(mainComposite);
-
- /*
- WSDL2JavaWidgetFactory.createXMLCatalogLabel(mainComposite);
-
- Text xmlCatalogText = WSDL2JavaWidgetFactory.createXMLCatalogText(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xmlCatalogText.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createXMLCatalogBrowseButton(mainComposite);
- */
- return this;
- }
-
- public Table createNamespaceMappingTable(Composite parent) {
- TableViewer packageNameTableViewer = new TableViewer(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER
- | SWT.FULL_SELECTION);
-
- final Table packageNameTable = packageNameTableViewer.getTable();
- packageNameTable.setLinesVisible(true);
- packageNameTable.setHeaderVisible(true);
-
- TableLayout tableLayout = new TableLayout();
- packageNameTable.setLayout(tableLayout);
-
- WSDL2JavaWidgetFactory.createWSDLNamespaceViewerColumn(packageNameTableViewer);
-
- ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- TableViewerColumn packageNameViewerColumn = WSDL2JavaWidgetFactory.createPackageNameColumn(
- packageNameTableViewer, model);
-
- TextCellEditor textCellEditor = new TextCellEditor(packageNameTableViewer.getTable());
- textCellEditor.addListener( new ICellEditorListener() {
-
- public void editorValueChanged(boolean oldValidState, boolean newValidState) {
- statusListener.handleEvent(null);
- }
-
- public void cancelEditor() {
- }
-
- public void applyEditorValue() {
- }
- });
-
- textCellEditor.setValidator(new ICellEditorValidator() {
-
- public String isValid(Object packageName) {
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
- if (status.getSeverity() == IStatus.OK) {
- return null;
- }
- return status.getMessage();
- }
- });
-
- packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
- textCellEditor, model));
-
- columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- packageNameTableViewer.setContentProvider(new PackageNameTableContentProvider());
- packageNameTableViewer.setInput(model.getWsdlDefinition());
-
- TableItem[] tableItems = packageNameTableViewer.getTable().getItems();
- for (int i = 0; i < tableItems.length; i++) {
- TableItem tableItem = tableItems[i];
- if (model.getIncludedNamespaces().containsKey(tableItem.getText(0))) {
- tableItem.setChecked(true);
- }
- }
- return packageNameTable;
- }
-
- private Composite getNamespaceMappingComposite(Composite parent) {
- namespaceComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, true);
- namespaceComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- namespaceComposite.setLayoutData(gridData);
-
- Table packageNameTable = createNamespaceMappingTable(namespaceComposite);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- packageNameTable.setLayoutData(gridData);
-
- return namespaceComposite;
- }
-
- @Override
- public IStatus getStatus() {
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
deleted file mode 100644
index 48828a1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidgetFactory implements INamedWidgetContributorFactory {
- private SimpleWidgetContributor wsdl2JavaClientWidgetContributor;
- private SimpleWidgetContributor wsdl2JavaClientDefaultsWidgetContributor;
-
- private WSDL2JavaClientConfigWidget wsdl2JavaConfigWidget = new WSDL2JavaClientConfigWidget();
- private WSDL2JavaClientDefaultsConfigWidget wsdl2JavaClientDefaultsConfigWidget = new WSDL2JavaClientDefaultsConfigWidget();
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if (wsdl2JavaClientWidgetContributor == null
- || wsdl2JavaClientDefaultsWidgetContributor == null) {
- init();
- }
- return wsdl2JavaClientWidgetContributor;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- if (widgetContributor == wsdl2JavaClientWidgetContributor) {
- return wsdl2JavaClientDefaultsWidgetContributor;
- }
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(WSDL2JavaClientDefaultingCommand.class,
- "WSDL2JavaDataModel", WSDL2JavaClientConfigWidgetFactory.class); //$NON-NLS-1$
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- wsdl2JavaConfigWidget.setWSDL2JavaDataModel(model);
- wsdl2JavaClientDefaultsConfigWidget.setWSDL2JavaDataModel(model);
- }
-
- private void init() {
- wsdl2JavaClientWidgetContributor = new SimpleWidgetContributor();
- CXFContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- String wsdl2JavaClientPageTitle = CXFConsumptionUIMessages.bind(
- CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_TITLE, new Object[]{
- context.getDefaultRuntimeType(), context.getDefaultRuntimeVersion()});
- wsdl2JavaClientWidgetContributor.setTitle(wsdl2JavaClientPageTitle);
- wsdl2JavaClientWidgetContributor
- .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_DESCRIPTION);
- wsdl2JavaClientWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaConfigWidget;
- }
- });
-
- wsdl2JavaClientDefaultsWidgetContributor = new SimpleWidgetContributor();
- String wsdl2JavaClientDefaultsPageTitle = CXFConsumptionUIMessages.bind(
- CXFConsumptionUIMessages.WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE, new Object[] {
- context.getDefaultRuntimeType(), context.getDefaultRuntimeVersion()});
- wsdl2JavaClientDefaultsWidgetContributor.setTitle(wsdl2JavaClientDefaultsPageTitle);
- wsdl2JavaClientDefaultsWidgetContributor
- .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION);
- wsdl2JavaClientDefaultsWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaClientDefaultsConfigWidget;
- }
- });
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
deleted file mode 100644
index ac49f67..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientDefaultsConfigWidget extends SimpleWidgetDataContributor {
-
- private WSDL2JavaDataModel model;
-
- public WSDL2JavaClientDefaultsConfigWidget() {
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(mainComposite, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(1, true);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- // WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, model);
- WSDL2JavaWidgetFactory.createGenerateImplementationButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(wsdl2javaGroup, model);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, model);
- }
-
- if (model.getDefaultRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, model);
- }
-
- Group xjcArgGroup = new Group(mainComposite, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_XJC_ARG_GROUP_LABEL);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- Table xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable, model);
- return this;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
deleted file mode 100644
index 2417e78..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-@SuppressWarnings("restriction")
-public class JAXWSSelectionTransformer implements Transformer {
-
- public Object transform(Object value) {
- if (value instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection) value;
- Object selection = structuredSelection.getFirstElement();
- if (selection instanceof IFile) {
- IFile file = (IFile) selection;
- String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
- return new StructuredSelection(fullyQualifiedJavaName);
- } else if (selection instanceof ICompilationUnit) {
- IResource resource = ((ICompilationUnit) selection).getResource();
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
- return new StructuredSelection(fullyQualifiedJavaName);
- }
- }
- if (selection instanceof String) {
- return structuredSelection;
- }
- }
- return value;
- }
-
- private String getFullyQualifiedJavaName(IFile resource) {
- IProject project = resource.getProject();
-
- IPath path = resource.getFullPath();
-
- if (path.getFileExtension() != null) {
- path = path.removeFileExtension();
- }
-
- String javaFileName = path.lastSegment();
-
- if (path.isAbsolute()) {
- try {
- IPath javaFolderPath = path.removeLastSegments(1);
- IPackageFragment packageFragment = JavaCore.create(project).findPackageFragment(
- javaFolderPath);
- return packageFragment.getElementName() + "." + javaFileName; //$NON-NLS-1$
- } catch (JavaModelException jme) {
- CXFConsumptionUIPlugin.log(jme.getStatus());
- }
- }
- return javaFileName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
deleted file mode 100644
index 84086c2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-@SuppressWarnings("restriction")
-public class CXFWebServiceClient extends AbstractWebServiceClient {
-
- public CXFWebServiceClient(WebServiceClientInfo info) {
- super(info);
- }
-
- @Override
- public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String projectName,
- String earProject) {
-
- Vector commands = new Vector();
-
- WSDL2JavaDataModel wsdl2JavaModel = CXFFactory.eINSTANCE.createWSDL2JavaDataModel();
- commands.add(new WSDL2JavaClientDefaultingCommand(wsdl2JavaModel, projectName,
- getWebServiceClientInfo().getWsdlURL()));
- commands.add(new WSDL2JavaClientCommand(wsdl2JavaModel));
-
- return new SimpleCommandFactory(commands);
- }
-
- @Override
- public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.ui/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/.project b/bundles/org.eclipse.jst.ws.cxf.ui/.project
deleted file mode 100644
index 160341a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8cadd13..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:55 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 3a89233..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.ui.dialogs;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.ui.viewers;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,org.eclipse.jst.ws.cxf.creation.ui",
- org.eclipse.jst.ws.internal.cxf.ui.widgets;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,1.5.0)"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 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
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.ui/build.properties
deleted file mode 100644
index fc67c48..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- .,\
- plugin.properties,\
- plugin.xml,\
- icons/
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/icons/obj16/library_obj.gif b/bundles/org.eclipse.jst.ws.cxf.ui/icons/obj16/library_obj.gif
deleted file mode 100644
index cb55e33..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/icons/obj16/library_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/icons/wizban/library_wiz.png b/bundles/org.eclipse.jst.ws.cxf.ui/icons/wizban/library_wiz.png
deleted file mode 100644
index 705dc30..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/icons/wizban/library_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.ui/plugin.properties
deleted file mode 100644
index 491c6b8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-PREFERENCE_CATEGORY_CXF_RUNTIME=CXF 2.x Preferences
-PROPERTIES_CATEGORY_CXF_RUNTIME=CXF 2.x Settings
-
-CXF_RUNTIME_NAME=CXF Runtime
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml
deleted file mode 100644
index f3f2225..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.cxf.ui.preferences.CXFRuntimePreferencePage"
- id="org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage"
- name="%PREFERENCE_CATEGORY_CXF_RUNTIME">
- </page>
- </extension>
-
- <!--<extension point="org.eclipse.ui.propertyPages">
- <page
- name="%PROPERTIES_CATEGORY_CXF_RUNTIME"
- class="org.eclipse.jst.ws.internal.cxf.ui.properties.CXFPropertyPage"
- id="org.eclipse.jst.ws.cxf.propertyPages.CXFPreferencePage">
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="cxf.core" />
- </adapt>
- </enabledWhen>
- </page>
- </extension> -->
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="cxf.core.install">
- <page
- class="org.eclipse.jst.ws.internal.cxf.ui.wizards.CXFFacetInstallWizardPage">
- </page>
- </wizard-pages>
- </extension>
-
- <extension point="org.eclipse.jdt.ui.classpathContainerPage">
- <classpathContainerPage
- class="org.eclipse.jst.ws.internal.cxf.ui.wizards.CXFClasspathContainerPage"
- id="org.eclipse.jst.ws.cxf.core.CXF_CLASSPATH_CONTAINER"
- name="%CXF_RUNTIME_NAME">
- </classpathContainerPage>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java
deleted file mode 100644
index b496476..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.cxf.ui.CXFUImessages"; //$NON-NLS-1$
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_ADD_BUTTON_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_EDIT_BUTTON_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_REMOVE_BUTTON_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSION_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_CXF_TYPE_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_DESCRIPTION_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_VERSION_COLUMN_NAME;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_LOCATION_COLUMN_NAME;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_TYPE_COLUMN_NAME;
-
- public static String CXF_RUNTIME_PREFERENCE_PAGE_ENTER_TYPE_NAME;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_INVALID_TYPE_NAME;
-
- public static String CXF_PROPERTY_PAGE_RUNTIME_LABEL;
- public static String CXF_CONFIGURE_INSTALLED_RUNTIMES_LABEL;
-
- public static String CXF_INSTALL_WIZARD_PAGE_TITLE;
- public static String CXF_INSTALL_WIZARD_PAGE_DESCRIPTION;
- public static String CXF_INSTALL_WIZARD_ADD_WINDOW_TITLE;
- public static String CXF_INSTALL_WIZARD_EDIT_WINDOW_TITLE;
-
- public static String CXF_FACET_INSTALL_WIZARD_PAGE_TITLE;
- public static String CXF_FACET_INSTALL_WIZARD_PAGE_DESCRIPTION;
-
- public static String JAVA2WS_PREFERENCES_TAB_NAME;
- public static String JAVA2WS_PREFERENCES_TAB_TOOLTIP;
-
- public static String JAVA2WSDL_PREFERENCES_TAB_NAME;
- public static String JAVA2WSDL_PREFERENCES_TAB_TOOLTIP;
-
- public static String ANNOTATIONS_PREFERENCES_TAB_NAME;
- public static String ANNOTATIONS_PREFERENCES_TAB_TOOLTIP;
-
- public static String WSDL2JAVA_PREFERENCES_TAB_NAME;
- public static String WSDL2JAVA_PREFERENCES_TAB_TOOLTIP;
-
- public static String SPRING_CONFIG_PREFERENCES_TAB_NAME;
- public static String SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP;
-
- public static String ANNOTATIONS_PREFERENCES_LINK;
-
- public static String CXF_DEFAULT_FRONTEND_LABEL;
- public static String CXF_DEFAULT_DATABINDING_LABEL;
- public static String JAVA2WS_GROUP_LABEL;
- public static String JAVA2WSDL_GROUP_LABEL;
- public static String WSDL2JAVA_GROUP_LABEL;
- public static String JAVA2WS_GEN_CLIENT_LABEL;
- public static String JAVA2WS_GEN_SERVER_LABEL;
- public static String JAVA2WS_GEN_IMPLEMENTATION_LABEL;
- public static String JAVA2WS_GEN_WRAPPER_FAULT_LABEL;
- public static String JAVA2WS_GEN_WSDL_LABEL;
- public static String JAVA2WS_DEFAULT_SOAPBINDING_LABEL;
- public static String JAVA2WS_GEN_XSD_IMPORTS;
- public static String CXF_INVALID_VERSION_FORMAT;
- public static String CXF_VERSION_NOT_SPECIFIED;
- public static String SPRING_CONFIG_GROUP_LABEL;
- public static String SPRING_CONFIG_USE_CXF_SERVLET;
- public static String SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT;
- public static String WSDL2JAVA_PROCESS_SOAP_HEADERS;
- public static String WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING;
- public static String WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING;
- public static String WSDL2JAVA_WSDL_VERSION_LABEL;
- public static String WSDL2JAVA_USE_DEFAULT_VALUES;
-
- public static String JAXWS_ANNOTATIONS_GROUP_LABEL;
- public static String JAXWS_ANNOTATIONS_GROUP_TOOLTIP;
- public static String JAXWS_GENERATE_WEB_METHOD;
- public static String JAXWS_GENERATE_WEB_PARAM;
- public static String JAXWS_GENERATE_REQUEST_WRAPPER;
- public static String JAXWS_GENERATE_RESPONSE_WRAPPER;
- public static String JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL;
- public static String JAXWS_ENABLE_ANNOTATION_PROCESSING;
- public static String JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP;
-
- public static String JAVA2WS_SOAP12_BINDING_TOOLTIP;
- public static String JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP;
- public static String JAVA2WS_DATABINDING_TOOLTIP;
- public static String JAVA2WS_FRONTEND_TOOLTIP;
- public static String JAVA2WS_GENERATE_WSDL_TOOLTIP;
- public static String JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP;
- public static String JAVA2WS_GENERATE_CLIENT_TOOLTIP;
- public static String JAVA2WS_GENERATE_SERVER_TOOLTIP;
- public static String JAVA2WS_GENERATE_ANT_TOOLTIP;
- public static String JAVA2WS_BEANS_TOOLTIP;
- public static String JAVA2WS_TARGET_NAMESPACE_TOOLTIP;
- public static String JAVA2WS_SERVICE_NAME_TOOLTIP;
- public static String JAVA2WS_PORT_NAME_TOOLTIP;
- public static String JAVA2WS_ADDRESS_TOOLTIP;
-
- public static String JAVA2WS_WSDL_FILE_NAME;
- public static String JAVA2WS_OUTPUT_FILE_TOOLTIP;
-
- public static String JAVA2WS_USE_SEI_BUTTON;
- public static String JAVA2WS_USE_SEI_INFO_LABEL;
-
- public static String JAVA2WS_SELECT_SEI;
- public static String JAVA2WS_SELECT_SEI_LABEL;
- public static String JAVA2WS_SELECT_SEI_TOOLTIP;
- public static String JAVA2WS_BROWSE_LABEL;
- public static String JAVA2WS_EXTRACT_SEI;
- public static String JAVA2WS_EXTRACT_SEI_LABEL;
- public static String JAVA2WS_EXTRACT_SEI_TOOLTIP;
- public static String JAVA2WS_EXTRACT_MEMBERS_LABEL;
-
- public static String JAVA2WS_SELECT_ALL_BUTTON;
- public static String JAVA2WS_DESELECT_ALL_BUTTON;
-
- public static String JAVA2WS_SELECT_IMPLEMENTATION;
- public static String JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP;
-
- public static String WSDL2JAVA_FRONTEND_TOOLTIP;
- public static String WSDL2JAVA_DATABINDING_TOOLTIP;
- public static String WSDL2JAVA_WSDL_VERSION_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_CLIENT_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_SERVER_TOOLTIP;
- public static String WSDL2JAVA_DEFAULT_VALUES_TOOLTIP;
- public static String WSDL2JAVA_EXCLUDE_NAMESPACE_TOOLTIP;
- public static String WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP;
- public static String WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP;
- public static String WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP;
- public static String WSDL2JAVA_WSDL_LOCATION_TOOLTIP;
- public static String WSDL2JAVA_NO_ADDRESS_BINDING;
- public static String WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP;
- public static String WSDL2JAVA_AUTO_NAME_RESOLUTION;
- public static String WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP;
- public static String WSDL2JAVA_XML_CATALOG_TOOLTIP;
- public static String WSDL2JAVA_XJC_ARGS_TOOLTIP;
- public static String WSDL2JAVA_XJC_ARG_GROUP_TITLE;
- public static String WSDL2JAVA_XJC_ARG_COLUMN_NAME;
- public static String WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME;
- public static String WSDL2JAVA_XJC_DEFAULT_VALUES;
- public static String WSDL2JAVA_XJC_TOSTRING;
- public static String WSDL2JAVA_XJC_TOSTRING_MULTILINE;
- public static String WSDL2JAVA_XJC_TOSTRING_SIMPLE;
- public static String WSDL2JAVA_XJC_LOCATOR;
- public static String WSDL2JAVA_XJC_SYNC_METHODS;
- public static String WSDL2JAVA_XJC_MARK_GENERATED;
- public static String WSDL2JAVA_XJC_EPISODE_FILE;
-
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON;
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON;
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR;
-
- public static String WSDL2JAVA_OUTPUT_DIRECTORY;
- public static String WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP;
-
- public static String WSDL2JAVA_PACKAGE_NAME;
- public static String WSDL2JAVA_PACKAGE_NAME_TOOLTIP;
-
- public static String WSDL2JAVA_PACKAGE_NAME_OPTIONAL;
- public static String WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP;
-
- public static String WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER;
- public static String WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER;
-
- public static String WSDL2JAVA_SERVICE_NAME;
- public static String WSDL2JAVA_SERVICE_NAME_TOOLTIP;
-
- public static String WSDL2JAVA_BINDING_FILES;
- public static String WSDL2JAVA_BINDING_NAME_TOOLTIP;
- public static String WSDL2JAVA_BINDING_FILES_ADD;
- public static String WSDL2JAVA_BINDING_FILES_REMOVE;
-
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_TITLE;
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE;
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME;
-
- public static String WSDL2JAVA_XML_CATLOG;
- public static String WSDL2JAVA_XML_CATLOG_TOOLTIP;
- public static String WSDL2JAVA_XML_CATLOG_BROWSE;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, CXFUIMessages.class);
- }
-
- private CXFUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
deleted file mode 100644
index 2d12299..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- */
-public class CXFUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFUIPlugin plugin;
-
- /**
- * The constructor
- */
- public CXFUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#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 CXFUIPlugin getDefault() {
- return plugin;
- }
-
- public static void logMessage(int severity, String message) {
- CXFUIPlugin.log(new Status(severity, CXFUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFUIPlugin.log(new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties
deleted file mode 100644
index 545762f..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties
+++ /dev/null
@@ -1,188 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-#CXF Preference Pages
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME=&CXF Runtime
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP=Browse and select CXF Binary distribution folder
-CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL=CXF &home:
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET=Missing CXF jar: Please select the CXF home directory.
-CXF_RUNTIME_PREFERENCE_PAGE_ADD_BUTTON_LABEL=&Add...
-CXF_RUNTIME_PREFERENCE_PAGE_EDIT_BUTTON_LABEL=&Edit...
-CXF_RUNTIME_PREFERENCE_PAGE_REMOVE_BUTTON_LABEL=&Remove
-CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL=&Browse...
-CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSION_LABEL=Version:
-CXF_RUNTIME_PREFERENCE_PAGE_CXF_TYPE_LABEL=Type:
-CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER=Export runtime libraries to WEB-INF/lib at deployment time
-CXF_RUNTIME_PREFERENCE_PAGE_DESCRIPTION_LABEL=Add, remove or edit CXF runtimes. By default, the checked CXF runtime is added to the build path of a project when installing the CXF facet.
-CXF_RUNTIME_PREFERENCE_PAGE_VERSION_COLUMN_NAME=Version
-CXF_RUNTIME_PREFERENCE_PAGE_LOCATION_COLUMN_NAME=Location
-CXF_RUNTIME_PREFERENCE_PAGE_TYPE_COLUMN_NAME=Type
-CXF_RUNTIME_PREFERENCE_PAGE_ENTER_TYPE_NAME=Enter type name
-CXF_RUNTIME_PREFERENCE_PAGE_INVALID_TYPE_NAME=Invalid type name: {0}
-CXF_PROPERTY_PAGE_RUNTIME_LABEL=CXF runtime:
-CXF_CONFIGURE_INSTALLED_RUNTIMES_LABEL=<A>Configure installed runtimes</A>
-
-CXF_INSTALL_WIZARD_PAGE_TITLE=CXF Runtime
-CXF_INSTALL_WIZARD_PAGE_DESCRIPTION=Specify the home directory of the CXF runtime.
-CXF_INSTALL_WIZARD_ADD_WINDOW_TITLE=Add CXF Runtime
-CXF_INSTALL_WIZARD_EDIT_WINDOW_TITLE=Edit CXF Runtime
-
-CXF_FACET_INSTALL_WIZARD_PAGE_TITLE=CXF Facet
-CXF_FACET_INSTALL_WIZARD_PAGE_DESCRIPTION=Configure the CXF facet settings.
-
-JAVA2WSDL_PREFERENCES_TAB_NAME=Java2WSDL
-JAVA2WSDL_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the Java2WSDL tool
-
-JAVA2WS_PREFERENCES_TAB_NAME=&Java2WS
-JAVA2WS_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the Java2WS tool
-
-ANNOTATIONS_PREFERENCES_LINK=See the <A>'JAX-WS'</A> tab for the annotation preferences.
-
-ANNOTATIONS_PREFERENCES_TAB_NAME=JA&X-WS
-ANNOTATIONS_PREFERENCES_TAB_TOOLTIP=Please select the JAX-WS annotations that are generated by default on the class or interface before input to Java2WS
-
-WSDL2JAVA_PREFERENCES_TAB_NAME=&WSDL2Java
-WSDL2JAVA_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the WSDL2Java tool
-
-SPRING_CONFIG_PREFERENCES_TAB_NAME=&Endpoint Config
-SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP=Please select the default option for Spring configuration generation
-SPRING_CONFIG_USE_CXF_SERVLET=Use CX&F Servlet
-SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT=Use Spring &Application Context
-
-CXF_DEFAULT_FRONTEND_LABEL=Default &Frontend:
-CXF_DEFAULT_DATABINDING_LABEL=Default &Databindng:
-JAVA2WS_GROUP_LABEL=Java2WS Generation Options:
-JAVA2WSDL_GROUP_LABEL=Java2WSDL Generation Options:
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options:
-JAVA2WS_GEN_CLIENT_LABEL=Generate Cli&ent
-JAVA2WS_GEN_SERVER_LABEL=Generate Ser&ver
-JAVA2WS_GEN_IMPLEMENTATION_LABEL=Generate &Implementation
-JAVA2WS_GEN_WRAPPER_FAULT_LABEL=Generate Wrapper and Fault &Beans
-JAVA2WS_GEN_WSDL_LABEL=Generate WSD&L
-JAVA2WS_DEFAULT_SOAPBINDING_LABEL=Default S&OAP Binding:
-JAVA2WS_GEN_XSD_IMPORTS=Generate separate XSD for the &types
-CXF_INVALID_VERSION_FORMAT=Invalid Version Format
-CXF_VERSION_NOT_SPECIFIED=CXF version value not specified
-SPRING_CONFIG_GROUP_LABEL=CXF Endpoint Configuration Options:
-WSDL2JAVA_PROCESS_SOAP_HEADERS=Enable &processing of implicit SOAP headers
-WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING=Enable &loading of the default namespace package name mapping
-WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING=Enable the use of the default &excludes namespace mapping
-WSDL2JAVA_WSDL_VERSION_LABEL=WSDL Version:
-WSDL2JAVA_USE_DEFAULT_VALUES=Generate &default values for the generated artifacts
-
-JAXWS_ANNOTATIONS_GROUP_LABEL=JAX-WS Annotation Generation
-JAXWS_ANNOTATIONS_GROUP_TOOLTIP=Select the annotations which are generated by default on the class or interface before input to Java2WS
-JAXWS_GENERATE_WEB_METHOD=@Web&Method
-JAXWS_GENERATE_WEB_PARAM=@Web&Param
-JAXWS_GENERATE_REQUEST_WRAPPER=@Re&questWrapper
-JAXWS_GENERATE_RESPONSE_WRAPPER=@&ResponseWrapper
-JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL=JAX-WS Annotation Processing
-JAXWS_ENABLE_ANNOTATION_PROCESSING=&Enable annotation validation processing
-JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP=Turn JAX-WS annotation processing on or off in projects configured for {0} web services
-
-JAVA2WS_SOAP12_BINDING_TOOLTIP=Specify to generate SOAP 1.2 binding
-JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP= Output schemas to separate files and use imports to load them instead of inlining them into the wsdl
-JAVA2WS_DATABINDING_TOOLTIP= Specify the data binding. Default is jaxb for jaxws frontend
-#JAVA2WS_DATABINDING_TOOLTIP= Specify the data binding (aegis or jaxb). Default is jaxb for jaxws frontend, and aegis for simple frontend
-JAVA2WS_FRONTEND_TOOLTIP=Specify the frontend to use
-#JAVA2WS_FRONTEND_TOOLTIP=Specify the frontend to use. jaxws and the simple frontend are supported
-JAVA2WS_GENERATE_WSDL_TOOLTIP=Specify to generate the WSDL file
-JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP=Specify to generate the wrapper and fault bean
-JAVA2WS_GENERATE_CLIENT_TOOLTIP=Generate a client mainline using JAX-WS APIs\n.....\n javax.xml.ws.Service service = javax.xml.ws.Service.create(...);\n... client = service.getPort(...);\n
-JAVA2WS_GENERATE_SERVER_TOOLTIP=Generate a server mainline using JAX-WS APIs\n.....\n javax.xml.ws.Endpoint.publish(...);\n.....\n
-JAVA2WS_GENERATE_ANT_TOOLTIP=Specify to generate an Ant build.xml file
-JAVA2WS_BEANS_TOOLTIP=Specify the pathname of a file defining additional Spring beans to customise data binding configuration
-JAVA2WS_TARGET_NAMESPACE_TOOLTIP=Specify the target namespace to use in the wsdl
-JAVA2WS_SERVICE_NAME_TOOLTIP=Specify the service name to use in the generated wsdl
-JAVA2WS_PORT_NAME_TOOLTIP=Specify the port name to use in the generated wsdl
-JAVA2WS_ADDRESS_TOOLTIP= Specify the port address
-
-JAVA2WS_WSDL_FILE_NAME=&WSDL File:
-JAVA2WS_OUTPUT_FILE_TOOLTIP=Specify the output wsdl file name
-
-JAVA2WS_USE_SEI_BUTTON=&Use a Service Endpoint Interface:
-JAVA2WS_USE_SEI_INFO_LABEL=(You may work directly with the {0} Java class. But working from an interface is the recommended approach. Two options are provided here.)
-JAVA2WS_SELECT_SEI=Select SEI:
-#JAVA2WS_SELECT_SEI_LABEL=Select SEI from &Type Hierarchy:
-JAVA2WS_SELECT_SEI_LABEL=Selec&t an SEI:
-JAVA2WS_SELECT_SEI_TOOLTIP=Select the Interface from the Type Hierarchy to use as the SEI
-JAVA2WS_BROWSE_LABEL=Browse...
-JAVA2WS_EXTRACT_SEI=Extract SEI:
-JAVA2WS_EXTRACT_SEI_LABEL=&Create an SEI:
-JAVA2WS_EXTRACT_SEI_TOOLTIP=Type the name of the Service Endpoint Interface to extract
-JAVA2WS_EXTRACT_MEMBERS_LABEL=Members to declare in the extracted SEI:
-JAVA2WS_SELECT_ALL_BUTTON=&Select All...
-JAVA2WS_DESELECT_ALL_BUTTON=&Deselect All...
-JAVA2WS_SELECT_IMPLEMENTATION=Select &Implementation:
-JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP=Select the Implementation
-
-WSDL2JAVA_FRONTEND_TOOLTIP=Specify the frontend. Default is JAXWS. Currently supports only JAXWS frontend
-WSDL2JAVA_DATABINDING_TOOLTIP=Specify the databinding. Default is JAXB. Currently supports only JAXB databinding
-WSDL2JAVA_WSDL_VERSION_TOOLTIP=Specify the wsdl version .Default is WSDL1.1. Currently supports only WSDL1.1 version
-WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP=Generate starting point code for an implementation object
-WSDL2JAVA_GENERATE_CLIENT_TOOLTIP=Generate the client code
-WSDL2JAVA_GENERATE_SERVER_TOOLTIP=Generate the server code
-WSDL2JAVA_DEFAULT_VALUES_TOOLTIP=Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-WSDL2JAVA_EXCLUDE_NAMESPACE_TOOLTIP=Ignore the specified WSDL schema namespaces when generating code
-WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP=Enables or disables processing of extended soap header message binding
-WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP=Enables or disables loading of the default namespace package name mapping
-WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP=Enables or disables loading of the default excludes namespace mapping
-WSDL2JAVA_WSDL_LOCATION_TOOLTIP=Specifies the value of the @WebService annotation's wsdlLocation property
-WSDL2JAVA_XML_CATALOG_TOOLTIP=Specify the URL of an XML catalog to use for resolving imported schemas and WSDL documents
-WSDL2JAVA_NO_ADDRESS_BINDING=Use the {0} proprietary WS-&Addressing type
-WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP=Use the {0} proprietary WS-Addressing type instead of the JAX-WS 2.1 compliant mapping
-WSDL2JAVA_AUTO_NAME_RESOLUTION=Enable Auto Name Resolution
-WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP=Automatically resolve naming conflicts without requiring the use of binding customizations
-WSDL2JAVA_XJC_ARGS_TOOLTIP=Specify the arguments to be passed directly to the XJC
-WSDL2JAVA_XJC_ARG_GROUP_TITLE=XJC Arguments
-WSDL2JAVA_XJC_ARG_COLUMN_NAME=XJC Arg
-WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME=Description
-WSDL2JAVA_XJC_DEFAULT_VALUES=Initialise fields mapped from elements with their default values
-WSDL2JAVA_XJC_TOSTRING=Activate plugin to add a toString() method to generated classes
-WSDL2JAVA_XJC_TOSTRING_MULTILINE=Have toString produce multi line output
-WSDL2JAVA_XJC_TOSTRING_SIMPLE=Have toString produce single line terse output
-WSDL2JAVA_XJC_LOCATOR=Enable source location support for generated code
-WSDL2JAVA_XJC_SYNC_METHODS=Generate accessor methods with the 'synchronized' keyword
-WSDL2JAVA_XJC_MARK_GENERATED=Add @Generated annotations to the generated code
-#Mark the generated code as @javax.annotation.Generated
-WSDL2JAVA_XJC_EPISODE_FILE= Generate the episode file for separate compilation
-#Resource Selection Dialog
-RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON=Browse Workspace...
-RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON=Browse File System...
-RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR=File Not Found
-
-WSDL2JAVA_OUTPUT_DIRECTORY=&Output Directory:
-WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP=Specify the directory into which the generated code files are written
-
-WSDL2JAVA_PACKAGE_NAME=&Package Name:
-WSDL2JAVA_PACKAGE_NAME_TOOLTIP=The java package name to use for the generated code
-
-WSDL2JAVA_PACKAGE_NAME_OPTIONAL=Specify &WSDL Namepsace to Package Name Mappings
-WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP=Optionally specify the wsdl namespace mapping to a particular java package name
-
-WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER=WSDL Namespace
-WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER=Package Name
-
-WSDL2JAVA_SERVICE_NAME=&Service Name:
-WSDL2JAVA_SERVICE_NAME_TOOLTIP=Specify the name of the WSDL service for which code is to be generated. The default is to generate code for every service in the WSDL document
-
-WSDL2JAVA_BINDING_FILES=&Binding Files:
-WSDL2JAVA_BINDING_NAME_TOOLTIP=Specify zero, or more, JAXWS or JAXB binding files
-WSDL2JAVA_BINDING_FILES_ADD=&Add...
-WSDL2JAVA_BINDING_FILES_REMOVE=&Remove...
-
-WSDL2JAVA_BINDING_FILE_DIALOG_TITLE=Browse for Binding File
-WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE=Binding File:
-WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME=JAXWS or JAXB Binding Files (*.xml)
-
-WSDL2JAVA_XML_CATLOG=XML Catalog:
-WSDL2JAVA_XML_CATLOG_TOOLTIP=Specify catalog file to map the imported wsdl/schema
-WSDL2JAVA_XML_CATLOG_BROWSE=Browse...
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java
deleted file mode 100644
index 9befcd1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.dialogs;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * A <code>SelectionStatusDialog</code> which allows the selection of files
- * with a specific extension from the workspace or file system.
- *
- */
-public class ResourceSelectionDialog extends SelectionStatusDialog {
- private IStatus OK_FILE_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private IStatus ERROR_FILE_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
- CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR);
-
- private IStatus VALIDATE_SELECTION_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private Text resourceText;
-
- private String filterExtension;
- private String filterName;
-
- /**
- * Creates an instance of <code>ResourceSelectionDialog</code>
- *
- * @param parent
- * @param filterExtension
- * the file name extension which the dialogs will use to filter
- * files
- * @param filterName
- * the name that describes the filterExtension
- * @param dialogTitle
- * the dialog title
- */
- public ResourceSelectionDialog(Shell parent, String filterExtension, String filterName, String dialogTitle) {
- super(parent);
-
- this.filterExtension = filterExtension;
- this.filterName = filterName;
-
- setTitle(dialogTitle);
- setStatusLineAboveButtons(true);
- int shellStyle = getShellStyle();
- setShellStyle(shellStyle | SWT.MAX | SWT.RESIZE);
- updateStatus(VALIDATE_SELECTION_STATUS);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- final Composite composite = (Composite) super.createDialogArea(parent);
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.widthHint = 500;
- buttonComposite.setLayoutData(gridData);
-
- GridLayout gridLayout = new GridLayout(3, false);
- buttonComposite.setLayout(gridLayout);
-
- Label messageLabel = createMessageArea(buttonComposite);
- gridData = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
- messageLabel.setLayoutData(gridData);
-
- Button browseWorkspace = new Button(buttonComposite, SWT.PUSH);
- browseWorkspace.setText(CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON);
- browseWorkspace.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- SelectionDialog dialog = createWorkspaceResourceDialog(composite.getShell());
- if (dialog.open() == SelectionDialog.OK) {
- Object[] result = dialog.getResult();
- IResource resource = (IResource) result[0];
- resourceText.setText(resource.getLocation().toOSString());
- }
- }
- });
-
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseWorkspace.setLayoutData(gridData);
-
- Button browseFileSystem = new Button(buttonComposite, SWT.PUSH);
- browseFileSystem.setText(CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON);
- browseFileSystem.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- FileDialog dialog = createFileSystemResourceDialog(composite.getShell());
- String result = dialog.open();
- if (result == null) {
- return;
- }
- IPath filterPath = new Path(dialog.getFilterPath());
- String buildFileName = dialog.getFileName();
- IPath path = filterPath.append(buildFileName).makeAbsolute();
-
- resourceText.setText(path.toOSString());
- }
- });
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseFileSystem.setLayoutData(gridData);
-
- resourceText = new Text(buttonComposite, SWT.BORDER);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- resourceText.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent event) {
- String resource = resourceText.getText();
- File file = new File(resource);
- if (file.exists()) {
- setResult(Arrays.asList(resource));
- updateStatus(OK_FILE_STATUS);
- } else {
- updateStatus(ERROR_FILE_STATUS);
- }
- }
- });
- gridData.horizontalSpan = 3;
- resourceText.setLayoutData(gridData);
-
- return composite;
- }
-
- private SelectionDialog createWorkspaceResourceDialog(Shell shell) {
- ElementTreeSelectionDialog workspaceResourceDialog = new ElementTreeSelectionDialog(shell,
- new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
- workspaceResourceDialog.setTitle(getMessage());
- workspaceResourceDialog.setMessage(filterName);
- workspaceResourceDialog.setAllowMultiple(false);
-
- workspaceResourceDialog.addFilter(new ViewerFilter() {
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (element instanceof IFile) {
- IFile file = (IFile) element;
- return file.isAccessible() && file.getFileExtension().equals(filterExtension);
- }
-
- if (element instanceof IProject && !((IProject) element).isOpen()) {
- IProject project = (IProject) element;
- return project.isAccessible();
- }
-
- if (element instanceof IContainer) {
- try {
- IContainer container = (IContainer) element;
- IResource[] resources = container.members();
- for (IResource resource : resources) {
- if (select(viewer, parentElement, resource)) {
- return true;
- }
- }
- } catch (CoreException ce) {
- CXFUIPlugin.log(ce.getStatus());
- }
- }
- return false;
- }
- });
-
- workspaceResourceDialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length > 0) {
- Object selected = selection[0];
- if (selected instanceof IFile) {
- IFile file = (IFile) selected;
- if (file.getFileExtension().equals(filterExtension)) {
- return OK_FILE_STATUS;
- }
- }
- }
- return VALIDATE_SELECTION_STATUS;
- }
- });
-
- workspaceResourceDialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
- return workspaceResourceDialog;
- }
-
- private FileDialog createFileSystemResourceDialog(Shell shell) {
- FileDialog dialog = new FileDialog(shell, SWT.OPEN);
- dialog.setFilterExtensions(new String[] { "*" + filterExtension }); //$NON-NLS-1$;
- dialog.setFilterNames(new String[] { filterName });
- return dialog;
- }
-
- @Override
- protected void computeResult() {
- // do nothing
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java
deleted file mode 100644
index c38f3c5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.preferences;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.AnnotationsComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.BlankRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.CXF20WSDL2JavaPreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.CXF21WSDL2JavaPreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSDLRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.SpringConfigComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.wizards.CXFInstallWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class CXFRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
- // private IStatus CXF_LOCATION_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, null);
- // private IStatus OK_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- //
- private ISelection previousInstall = new StructuredSelection();
-
- private Button addButton;
- private Button editButton;
- private Button removeButton;
-
- private CheckboxTableViewer cxfInstallations;
-
- private Button exportCXFClasspathContainerButton;
-
- private CXFContext context;
-
- private Java2WSDLRuntimePreferencesComposite java2WSDLRuntimePreferencesComposite;
- private Java2WSRuntimePreferencesComposite java2WSRuntimePreferencesComposite ;
-
- private CXF20WSDL2JavaPreferencesComposite cxf20WSDL2JavaPreferencesComposite;
- private CXF21WSDL2JavaPreferencesComposite cxf21WSDL2JavaPreferencesComposite;
-
- private AnnotationsComposite annotationsComposite;
-
- private SpringConfigComposite springConfigComposite;
-
- private StackLayout java2WSStackLayout;
- private StackLayout wsdl2javaStackLayout;
- private StackLayout jaxwsStackLayout;
- private StackLayout springConfigStackLayout;
-
- private Composite java2WSPreferncesGroup;
- private Composite wsdl2JavaPreferencesGroup;
- private Composite jaxwsPreferencesGroup;
- private Composite springConfigPreferncesGroup;
-
- private Composite java2WSDLPreferencesComposite;
- private Composite java2WSPreferencesComposite;
-
- private Composite jaxwsPreferencesComposite;
-
- private Composite wsdl2Java20PreferencesComposite;
- private Composite wsdl2Java21PreferencesComposite;
-
- private Composite springPreferencesComposite;
-
- private BlankRuntimePreferencesComposite java2WSBlankPreferencesComposite;
- private BlankRuntimePreferencesComposite wsdl2JavaBlankPreferencesComposite;
- private BlankRuntimePreferencesComposite jaxwsBlankPreferencesComposite;
- private BlankRuntimePreferencesComposite springConfigBlankPreferencesComposite;
-
- private Image libraryImage;
-
- public CXFRuntimePreferencePage() {
- libraryImage = CXFUIPlugin.imageDescriptorFromPlugin(CXFUIPlugin.PLUGIN_ID, "icons/obj16/library_obj.gif").createImage(); //$NON-NLS-1$
- }
-
- public void init(IWorkbench workbench) {
- }
-
- @Override
- protected Control createContents(Composite parent) {
- context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- final Composite composite = new Composite(parent, SWT.NONE);
-
- GridLayout mainLayout = new GridLayout();
- composite.setLayout(mainLayout);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gridData);
-
- TabFolder cxfPreferenceTab = new TabFolder(composite, SWT.NONE);
- gridData = new GridData(GridData.FILL_BOTH);
- cxfPreferenceTab.setLayoutData(gridData);
-
- //CXF Runtime Location
- TabItem runtimeInstalLocationItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- runtimeInstalLocationItem.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME);
- runtimeInstalLocationItem.setToolTipText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP);
-
- final Composite runtimeGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- runtimeInstalLocationItem.setControl(runtimeGroup);
- runtimeGroup.setToolTipText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP);
-
- GridLayout runtimeLoactionlayout = new GridLayout();
- runtimeLoactionlayout.numColumns = 3;
- runtimeLoactionlayout.marginHeight = 10;
- runtimeGroup.setLayout(runtimeLoactionlayout);
- gridData = new GridData(GridData.FILL_BOTH);
- runtimeGroup.setLayoutData(gridData);
-
- Label runtimeTabDescriptionLabel = new Label(runtimeGroup, SWT.WRAP);
- runtimeTabDescriptionLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_DESCRIPTION_LABEL);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
-
- gridData.horizontalSpan = 3;
- gridData.widthHint = 300;
- runtimeTabDescriptionLabel.setLayoutData(gridData);
-
- Table installTable = new Table(runtimeGroup, SWT.CHECK | SWT.MULTI | SWT.BORDER
- | SWT.FULL_SELECTION);
- installTable.setLinesVisible(true);
- installTable.setHeaderVisible(true);
-
- TableLayout tableLayout = new TableLayout();
- installTable.setLayout(tableLayout);
-
- cxfInstallations = new CheckboxTableViewer(installTable);
- cxfInstallations.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- if (event.getChecked()) {
- setCheckedInstall(event.getElement());
- } else {
- setCheckedInstall(null);
- }
- }
- });
-
- cxfInstallations.addSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- int noElements = selection.size();
- if (noElements > 1) {
- editButton.setEnabled(false);
- } else {
- editButton.setEnabled(true);
- }
- removeButton.setEnabled(!selection.isEmpty());
- }
- });
- TableViewerColumn versionViewerColumn = new TableViewerColumn(cxfInstallations, SWT.LEFT);
- versionViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof CXFInstall) {
- CXFInstall install = (CXFInstall) element;
- String version = install.getVersion().toString().trim();
- return version;
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof CXFInstall) {
- return libraryImage;
- }
- return null;
- }
- });
- TableColumn versionColumn = versionViewerColumn.getColumn();
- versionColumn.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_VERSION_COLUMN_NAME);
- versionColumn.pack();
-
- ColumnWeightData columnWeightData = new ColumnWeightData(50, 50, true);
- tableLayout.addColumnData(columnWeightData);
-
- TableViewerColumn locationViewerColumn = new TableViewerColumn(cxfInstallations, SWT.LEFT);
- locationViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof CXFInstall) {
- CXFInstall install = (CXFInstall) element;
- return install.getLocation().toString().trim();
- }
- return ""; //$NON-NLS-1$
- }
- });
-
- TableColumn locationColumn = locationViewerColumn.getColumn();
- locationColumn.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_LOCATION_COLUMN_NAME);
- locationColumn.pack();
-
- columnWeightData = new ColumnWeightData(50, 150, true);
- tableLayout.addColumnData(columnWeightData);
-
- TableViewerColumn typeViewerColumn = new TableViewerColumn(cxfInstallations, SWT.LEFT);
- typeViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof CXFInstall) {
- CXFInstall install = (CXFInstall) element;
- return install.getType().toString().trim();
- }
- return ""; //$NON-NLS-1$
- }
- });
-
- TableColumn typeColumn = typeViewerColumn.getColumn();
- typeColumn.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_TYPE_COLUMN_NAME);
- typeColumn.pack();
-
- columnWeightData = new ColumnWeightData(50, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 2;
- gridData.verticalSpan = 5;
- cxfInstallations.getTable().setLayoutData(gridData);
-
- cxfInstallations.setContentProvider(new IStructuredContentProvider() {
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Collection<?>) {
- return ((Collection<?>) inputElement).toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- });
-
- cxfInstallations.setComparator(new ViewerComparator() {
- @Override
- public int compare(Viewer viewer, Object obj1, Object obj2) {
- if (obj1 instanceof CXFInstall && obj2 instanceof CXFInstall) {
- return ((CXFInstall) obj1).getVersion().toString().trim().compareTo(
- ((CXFInstall) obj2).getVersion().toString().trim());
- }
- return super.compare(viewer, obj1, obj2);
- }
- });
-
- cxfInstallations.setInput(context.getInstallations().values());
-
- addButton = new Button(runtimeGroup, SWT.NONE);
- addButton.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_ADD_BUTTON_LABEL);
- gridData = new GridData(SWT.FILL, SWT.BEGINNING, false, false);
- addButton.setLayoutData(gridData);
- addButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- CXFInstallWizard installWizard = new CXFInstallWizard();
- WizardDialog dialog = new WizardDialog(getShell(), installWizard);
- if (dialog.open() == Window.OK) {
- cxfInstallations.refresh();
- }
- }
- });
-
- editButton = new Button(runtimeGroup, SWT.NONE);
- editButton.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_EDIT_BUTTON_LABEL);
- gridData = new GridData(SWT.FILL, SWT.BEGINNING, false, false);
- editButton.setLayoutData(gridData);
- editButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- IStructuredSelection selection = (IStructuredSelection) cxfInstallations.getSelection();
- if (selection != null && selection.getFirstElement() instanceof CXFInstall) {
- cxfInstallations.getCheckedElements();
- //int selectedInstall = cxfInstallations.getTable().getSelectionIndex();
- String checkedVersion = getCheckedVersion();
- CXFInstallWizard installWizard = new CXFInstallWizard((CXFInstall) selection.getFirstElement());
- WizardDialog dialog = new WizardDialog(getShell(), installWizard);
- if (dialog.open() == Window.OK) {
- cxfInstallations.refresh();
- if (checkedVersion != null) {
- setCheckedVersion(checkedVersion);
- }
- }
- }
- }
- });
- editButton.setEnabled(false);
-
- removeButton = new Button(runtimeGroup, SWT.NONE);
- removeButton.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_REMOVE_BUTTON_LABEL);
- gridData = new GridData(SWT.FILL, SWT.BEGINNING, false, false);
- removeButton.setLayoutData(gridData);
- removeButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- IStructuredSelection selection = (IStructuredSelection) cxfInstallations.getSelection();
- @SuppressWarnings("unchecked")
- Iterator<CXFInstall> iter = selection.iterator();
- Map<String, CXFInstall> installations = context.getInstallations();
- while (iter.hasNext()) {
- CXFInstall install = iter.next();
- installations.remove(install.getVersion());
- }
- context.setInstallations(installations);
- cxfInstallations.refresh();
- if (cxfInstallations.getCheckedElements().length == 0) {
- setCheckedInstall(null);
- }
- }
- });
- removeButton.setEnabled(false);
-
- Label paddingLabel = new Label(runtimeGroup, SWT.NONE);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- paddingLabel.setLayoutData(gridData);
-
- exportCXFClasspathContainerButton = new Button(runtimeGroup, SWT.CHECK);
- exportCXFClasspathContainerButton.setText(
- CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER);
- exportCXFClasspathContainerButton.setSelection(context.isExportCXFClasspathContainer());
- exportCXFClasspathContainerButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- context.setExportCXFClasspathContainer(((Button) e.widget).getSelection());
- }
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- exportCXFClasspathContainerButton.setLayoutData(gridData);
-
- if (context.getDefaultRuntimeVersion().length() > 0) {
- exportCXFClasspathContainerButton.setEnabled(true);
- } else {
- exportCXFClasspathContainerButton.setEnabled(false);
- }
-
- //Java2WS
- TabItem java2WSTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- java2WSTabItem.setText(CXFUIMessages.JAVA2WS_PREFERENCES_TAB_NAME);
- java2WSTabItem.setToolTipText(CXFUIMessages.JAVA2WS_PREFERENCES_TAB_TOOLTIP);
-
- java2WSPreferncesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- java2WSStackLayout = new StackLayout();
- java2WSPreferncesGroup.setLayout(java2WSStackLayout);
-
- java2WSDLPreferencesComposite = new Composite(java2WSPreferncesGroup, SWT.NONE);
- GridLayout java2WSGridLayout = new GridLayout(1, true);
- java2WSDLPreferencesComposite.setLayout(java2WSGridLayout);
-
- java2WSDLRuntimePreferencesComposite = new Java2WSDLRuntimePreferencesComposite(
- java2WSDLPreferencesComposite, SWT.NONE, cxfPreferenceTab);
- java2WSDLRuntimePreferencesComposite.addControls();
-
- java2WSPreferencesComposite = new Composite(java2WSPreferncesGroup, SWT.NONE);
- GridLayout java2WSDLGridLayout = new GridLayout(1, true);
- java2WSPreferencesComposite.setLayout(java2WSDLGridLayout);
-
- java2WSRuntimePreferencesComposite = new Java2WSRuntimePreferencesComposite(
- java2WSPreferencesComposite, SWT.NONE, cxfPreferenceTab);
- java2WSRuntimePreferencesComposite.addControls();
-
- java2WSBlankPreferencesComposite = new BlankRuntimePreferencesComposite(java2WSPreferncesGroup,
- SWT.NONE);
-
- java2WSTabItem.setControl(java2WSPreferncesGroup);
-
- //WSDL2Java
- TabItem wsdl2JavaTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- wsdl2JavaTabItem.setText(CXFUIMessages.WSDL2JAVA_PREFERENCES_TAB_NAME);
- wsdl2JavaTabItem.setToolTipText(CXFUIMessages.WSDL2JAVA_PREFERENCES_TAB_TOOLTIP);
-
- wsdl2JavaPreferencesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- wsdl2javaStackLayout = new StackLayout();
- wsdl2JavaPreferencesGroup.setLayout(wsdl2javaStackLayout);
-
- wsdl2Java20PreferencesComposite = new Composite(wsdl2JavaPreferencesGroup, SWT.NONE);
- GridLayout wsdl2Java20GridLayout = new GridLayout(1, true);
- wsdl2Java20PreferencesComposite.setLayout(wsdl2Java20GridLayout);
-
- cxf20WSDL2JavaPreferencesComposite = new CXF20WSDL2JavaPreferencesComposite(
- wsdl2Java20PreferencesComposite, SWT.NONE);
- cxf20WSDL2JavaPreferencesComposite.addControls();
-
- wsdl2Java21PreferencesComposite = new Composite(wsdl2JavaPreferencesGroup, SWT.NONE);
- GridLayout wsdl2Java21GridLayout = new GridLayout(1, true);
- wsdl2Java21PreferencesComposite.setLayout(wsdl2Java21GridLayout);
-
- cxf21WSDL2JavaPreferencesComposite = new CXF21WSDL2JavaPreferencesComposite(
- wsdl2Java21PreferencesComposite, SWT.NONE);
- cxf21WSDL2JavaPreferencesComposite.addControls();
-
- wsdl2JavaBlankPreferencesComposite = new BlankRuntimePreferencesComposite(wsdl2JavaPreferencesGroup,
- SWT.NONE);
-
- wsdl2JavaTabItem.setControl(wsdl2JavaPreferencesGroup);
-
- //JAX-WS
- TabItem annotationsTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- annotationsTabItem.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_TAB_NAME);
- annotationsTabItem.setToolTipText(CXFUIMessages.ANNOTATIONS_PREFERENCES_TAB_TOOLTIP);
-
- jaxwsPreferencesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- jaxwsStackLayout = new StackLayout();
- jaxwsPreferencesGroup.setLayout(jaxwsStackLayout);
-
- jaxwsPreferencesComposite = new Composite(jaxwsPreferencesGroup, SWT.NONE);
- GridLayout jaxwsGridLayout = new GridLayout(1, true);
- jaxwsPreferencesComposite.setLayout(jaxwsGridLayout);
- annotationsComposite = new AnnotationsComposite(jaxwsPreferencesComposite, SWT.SHADOW_IN);
-
- jaxwsBlankPreferencesComposite = new BlankRuntimePreferencesComposite(jaxwsPreferencesGroup,
- SWT.NONE);
-
- annotationsTabItem.setControl(jaxwsPreferencesGroup);
-
- //Spring Config
- TabItem springConfigTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- springConfigTabItem.setText(CXFUIMessages.SPRING_CONFIG_PREFERENCES_TAB_NAME);
- springConfigTabItem.setToolTipText(CXFUIMessages.SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP);
-
- springConfigPreferncesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- springConfigStackLayout = new StackLayout();
- springConfigPreferncesGroup.setLayout(springConfigStackLayout);
-
- springPreferencesComposite = new Composite(springConfigPreferncesGroup, SWT.NONE);
- GridLayout springGridLayout = new GridLayout(1, true);
- springPreferencesComposite.setLayout(springGridLayout);
- springConfigComposite = new SpringConfigComposite(springPreferencesComposite, SWT.SHADOW_IN);
-
- springConfigBlankPreferencesComposite = new BlankRuntimePreferencesComposite(springConfigPreferncesGroup,
- SWT.NONE);
-
- springConfigTabItem.setControl(springConfigPreferncesGroup);
-
- CXFInstall defaultInstall = getDefaultInstall();
- if (defaultInstall != null) {
- setSelection(new StructuredSelection(defaultInstall));
- }
-
- handlePreferenceControls();
-
- composite.pack();
- return composite;
- }
-
- private CXFInstall getDefaultInstall() {
- Collection<CXFInstall> set = context.getInstallations().values();
- Iterator<CXFInstall> setIterator = set.iterator();
- while (setIterator.hasNext()) {
- CXFInstall entry = setIterator.next();
- if (entry.getVersion().toString().trim().equals(context.getDefaultRuntimeVersion())) {
- return entry;
- }
- }
- return null;
- }
-
- private String getCheckedVersion() {
- Object[] checkedElements = cxfInstallations.getCheckedElements();
- if (checkedElements.length > 0) {
- return ((CXFInstall) checkedElements[0]).getVersion();
- }
- return null;
- }
-
- private void setCheckedVersion(String version) {
- TableItem[] tableItems = cxfInstallations.getTable().getItems();
- for (TableItem install : tableItems) {
- if (install.getText(0).equals(version)) {
- install.setChecked(true);
- }
- }
- }
-
- private void setCheckedInstall(Object element) {
- if (element == null) {
- setSelection(new StructuredSelection());
- } else {
- setSelection(new StructuredSelection(element));
- }
- }
-
- public void setSelection(ISelection selection) {
- if (selection instanceof IStructuredSelection) {
- if (!selection.equals(previousInstall)) {
- previousInstall = selection;
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- CXFInstall install = (CXFInstall) structuredSelection.getFirstElement();
- if (install != null) {
- cxfInstallations.setCheckedElements(new Object[]{ install });
- cxfInstallations.reveal(install);
- context.setDefaultRuntimeVersion(install.getVersion());
- context.setDefaultRuntimeLocation(install.getLocation());
- context.setDefaultRuntimeType(install.getType());
- exportCXFClasspathContainerButton.setEnabled(true);
- } else {
- context.setDefaultRuntimeVersion(""); //$NON-NLS-1$
- context.setDefaultRuntimeLocation(""); //$NON-NLS-1$
- context.setDefaultRuntimeType(""); //$NON-NLS-1$
- exportCXFClasspathContainerButton.setEnabled(false);
- }
- handlePreferenceControls();
- }
- }
- }
-
- private void handlePreferenceControls() {
- if (context.getDefaultRuntimeLocation().equals("") || context.getDefaultRuntimeVersion().equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
- java2WSStackLayout.topControl = java2WSBlankPreferencesComposite;
- wsdl2javaStackLayout.topControl = wsdl2JavaBlankPreferencesComposite;
- jaxwsStackLayout.topControl = jaxwsBlankPreferencesComposite;
- springConfigStackLayout.topControl = springConfigBlankPreferencesComposite;
- } else if (context.getDefaultRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- java2WSStackLayout.topControl = java2WSPreferencesComposite;
- wsdl2javaStackLayout.topControl = wsdl2Java21PreferencesComposite;
- jaxwsStackLayout.topControl = jaxwsPreferencesComposite;
- springConfigStackLayout.topControl = springPreferencesComposite;
- } else {
- java2WSStackLayout.topControl = java2WSDLPreferencesComposite;
- wsdl2javaStackLayout.topControl = wsdl2Java20PreferencesComposite;
- jaxwsStackLayout.topControl = jaxwsPreferencesComposite;
- springConfigStackLayout.topControl = springPreferencesComposite;
- }
- java2WSPreferncesGroup.layout();
- wsdl2JavaPreferencesGroup.layout();
- jaxwsPreferencesGroup.layout();
- springConfigPreferncesGroup.layout();
- refresh();
- }
-
- // private void updateStatus() {
- // // CXF_LOCATION_STATUS = checkRuntimeExist(cxfHomeDirText.getText());
- // applyStatusToPage(findMostSevere());
- // }
-
- // private void applyStatusToPage(IStatus status) {
- // String message = status.getMessage();
- // if (status.getSeverity() > IStatus.OK) {
- // setErrorMessage(message);
- // } else {
- // setMessage(getTitle());
- // setErrorMessage(null);
- // }
- //
- // }
- //
- // private IStatus findMostSevere() {
- // return CXF_LOCATION_STATUS;
- // }
-
- private void setDefaults() {
- exportCXFClasspathContainerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER));
-
- java2WSDLRuntimePreferencesComposite.setDefaults();
- java2WSRuntimePreferencesComposite.setDefaults();
- cxf20WSDL2JavaPreferencesComposite.setDefaults();
- cxf21WSDL2JavaPreferencesComposite.setDefaults();
- annotationsComposite.setDefaults();
- springConfigComposite.setDefaults();
- }
-
- private void refresh() {
- if (context.getDefaultRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- java2WSRuntimePreferencesComposite.refresh();
- cxf21WSDL2JavaPreferencesComposite.refresh();
- } else {
- java2WSDLRuntimePreferencesComposite.refresh();
- cxf20WSDL2JavaPreferencesComposite.refresh();
- }
- }
-
- private void storeValues() {
- context.setExportCXFClasspathContainer(exportCXFClasspathContainerButton.getSelection());
-
- if (context.getDefaultRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- java2WSRuntimePreferencesComposite.storeValues();
- cxf21WSDL2JavaPreferencesComposite.storeValues();
- } else {
- java2WSDLRuntimePreferencesComposite.storeValues();
- cxf20WSDL2JavaPreferencesComposite.storeValues();
- }
- annotationsComposite.storeValues();
- springConfigComposite.storeValues();
- }
-
- @Override
- protected void performApply() {
- super.performApply();
- }
-
- @Override
- public boolean performCancel() {
- return super.performCancel();
- }
-
- @Override
- protected void performDefaults() {
- super.performDefaults();
- setDefaults();
- }
-
- @Override
- public boolean performOk() {
- storeValues();
- return true;
- }
-
- @Override
- public void dispose() {
- super.dispose();
- if (libraryImage != null) {
- libraryImage.dispose();
- libraryImage = null;
- }
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/properties/CXFPropertyPage.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/properties/CXFPropertyPage.java
deleted file mode 100644
index f049dad..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/properties/CXFPropertyPage.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.properties;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.cxf.core.CXFClasspathContainer;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-public class CXFPropertyPage extends PropertyPage {
-
- private IJavaProject javaProject;
- private IProject project;
- private ComboViewer installationsComboViewer;
- private Link link;
- private CXFInstall defaultInstall;
- private CXFContext context;
-
- public CXFPropertyPage() {
- context = CXFCorePlugin.getDefault().getJava2WSContext();
- }
-
- @Override
- protected Control createContents(Composite parent) {
- IAdaptable element = getElement();
-
- if (!(element instanceof IJavaProject)) {
- return null;
- }
-
- javaProject = (IJavaProject) element;
- this.project = javaProject.getProject();
-
- Composite composite = new Composite(parent, SWT.NONE);
-
- GridLayout gridLayout = new GridLayout(2, false);
- composite.setLayout(gridLayout);
-
- link = new Link(composite, SWT.NONE);
- link.setText(CXFUIMessages.CXF_CONFIGURE_INSTALLED_RUNTIMES_LABEL);
- link.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- int selectedIndex = installationsComboViewer.getCombo().getSelectionIndex();
- int result = PreferencesUtil.createPreferenceDialogOn(getShell(),
- "org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage", //$NON-NLS-1$
- new String[] {"org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage"}, null).open(); //$NON-NLS-1$
- if (result == Window.OK) {
- installationsComboViewer.refresh();
- installationsComboViewer.getCombo().select(selectedIndex);
- }
- }
- });
-
- GridData gridData = new GridData(SWT.END, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- link.setLayoutData(gridData);
-
- Label label = new Label(composite, SWT.NONE);
- label.setText(CXFUIMessages.CXF_PROPERTY_PAGE_RUNTIME_LABEL);
-
- installationsComboViewer = new ComboViewer(composite, SWT.BORDER | SWT.READ_ONLY);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- installationsComboViewer.getCombo().setLayoutData(gridData);
-
- installationsComboViewer.setContentProvider(new IStructuredContentProvider() {
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Collection<?>) {
- return ((Collection<?>) inputElement).toArray();
- }
- return new Object[] {};
- }
- });
-
- installationsComboViewer.setLabelProvider(new LabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof CXFInstall) {
- CXFInstall cxfInstall = (CXFInstall) element;
- return cxfInstall.getType() + " " + cxfInstall.getVersion();
- }
- return ""; //$NON-NLS-1$
- }
-
- });
-
- Collection<CXFInstall> installations = context.getInstallations().values();
-
- installationsComboViewer.setInput(installations);
-
- String intalledVersion = CXFCorePlugin.getDefault().getCXFRuntimeVersion(project);
- defaultInstall = context.getInstallations().get(intalledVersion);
- if (defaultInstall != null) {
- installationsComboViewer.setSelection(new StructuredSelection(defaultInstall), true);
- }
- return composite;
- }
-
- @Override
- public boolean performOk() {
- CXFInstall selectedInstall = getSelectedInstall();
- //if (isUpdateRequired(project, selectedInstall)) {
- //if (!defaultInstall.getVersion().equals(selectedInstall.getVersion())) {
- if (selectedInstall != null) {
- CXFCorePlugin.getDefault().setCXFRuntimeVersion(project, selectedInstall.getVersion());
-
- ClasspathContainerInitializer classpathContainerInitializer = JavaCore.getClasspathContainerInitializer(
- CXFCorePlugin.CXF_CLASSPATH_CONTAINER_ID);
- if (classpathContainerInitializer != null) {
- IPath containerPath = new Path(CXFCorePlugin.CXF_CLASSPATH_CONTAINER_ID);
- CXFClasspathContainer cxfClasspathContainer = new CXFClasspathContainer(containerPath, javaProject);
- try {
- classpathContainerInitializer.requestClasspathContainerUpdate(containerPath, javaProject,
- cxfClasspathContainer);
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
- }
- return true;
- }
-
- private CXFInstall getSelectedInstall() {
- StructuredSelection structuredSelection = (StructuredSelection) installationsComboViewer.getSelection();
- if (!structuredSelection.isEmpty()) {
- CXFInstall selectedInstall = (CXFInstall) structuredSelection.getFirstElement();
- return selectedInstall;
- }
- return null;
- }
-
- @Override
- protected void performDefaults() {
- CXFInstall defaultInstall = context.getInstallations().get(context.getDefaultRuntimeVersion());
- if (defaultInstall != null) {
- installationsComboViewer.setSelection(new StructuredSelection(defaultInstall), true);
- }
- super.performDefaults();
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/JavaViewerFilter.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/JavaViewerFilter.java
deleted file mode 100644
index 8440008..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/JavaViewerFilter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-
-/**
- * <code>ViewerFilter</code> that filters on classes or interfaces within a <code>IJavaProject</code>
- *
- */
-public class JavaViewerFilter extends ViewerFilter {
-
- private IJavaProject javaProject;
- private int elementKinds;
-
- /**
- * Constructs an instance of <code>JavaViewerFilter</code> given a <code>IJavaProject</code> and an
- * <code>IJavaSearchConstants</code> element kind to search for. All other elements are filtered.
- *
- * @param javaProject the java project to filter
- * @param elementKinds a flag defining nature of searched elements; the only valid values are:
- * <code>IJavaSearchConstants.CLASS</code>
- * <code>IJavaSearchConstants.INTERFACE</code>
- * <code>IJavaSearchConstants.CLASS_AND_INTERFACE</code>
- */
- public JavaViewerFilter(IJavaProject javaProject, int elementKinds) {
- this.javaProject = javaProject;
- this.elementKinds = elementKinds;
-
- }
-
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- try {
- if (element instanceof IJavaProject) {
- return javaProject.equals((IJavaProject) element);
- }
- if (element instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
- return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
- }
- if (element instanceof IPackageFragment) {
- IPackageFragment packageFragment = (IPackageFragment) element;
- return packageFragment.hasChildren();
- }
- if (element instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType type = compilationUnit.findPrimaryType();
- switch (elementKinds) {
- case IJavaSearchConstants.CLASS:
- return type.isClass();
- case IJavaSearchConstants.INTERFACE:
- return type.isInterface() && !type.isAnnotation();
- case IJavaSearchConstants.CLASS_AND_INTERFACE:
- return type.isClass() || (type.isInterface() && !type.isAnnotation());
- }
-
- }
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
- return false;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java
deleted file mode 100644
index 2606742..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-
-public class PackageNameColumnLabelProvider extends ColumnLabelProvider {
- private Map<String, String> includedNamespaces;
-
- public PackageNameColumnLabelProvider(WSDL2JavaDataModel model) {
- includedNamespaces = model.getIncludedNamespaces();
- }
-
- @Override
- public String getText(Object element) {
- if (includedNamespaces.containsKey(element.toString())) {
- return includedNamespaces.get(element.toString());
- }
- return WSDLUtils.getPackageNameFromNamespace(element.toString());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java
deleted file mode 100644
index b4657fb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public class PackageNameEditingSupport extends EditingSupport implements SelectionListener {
- private CellEditor packageNameCellEditor;
- private Table table;
- private Map<String, String> includedNamespaces;
-
- public PackageNameEditingSupport(TableViewer tableViewer, CellEditor packageNameCellEditor,
- WSDL2JavaDataModel model) {
- super(tableViewer);
- this.table = tableViewer.getTable();
- this.packageNameCellEditor = packageNameCellEditor;
- includedNamespaces = model.getIncludedNamespaces();
- table.addSelectionListener(this);
- }
-
- @Override
- protected boolean canEdit(Object element) {
- return table.getSelection()[0].getChecked();
- }
-
- @Override
- protected CellEditor getCellEditor(Object element) {
- return packageNameCellEditor;
- }
-
- @Override
- protected Object getValue(Object element) {
- if (includedNamespaces.containsKey(element.toString())) {
- return includedNamespaces.get(element.toString());
- }
- return WSDLUtils.getPackageNameFromNamespace(element.toString());
- }
-
- @Override
- protected void setValue(Object namespace, Object packageName) {
- if (namespace != null && packageName != null) {
- includedNamespaces.put(namespace.toString(), packageName.toString());
- getViewer().update(namespace, null);
- }
- }
-
- public void widgetSelected(SelectionEvent event) {
- if (event.detail == SWT.CHECK) {
- TableItem item = (TableItem) event.item;
- String namespaceKey = item.getText(0);
- String packageName = item.getText(1);
- if (item.getChecked()) {
- if (!includedNamespaces.containsKey(namespaceKey)) {
- includedNamespaces.put(namespaceKey, packageName);
- }
- } else {
- if (includedNamespaces.containsKey(namespaceKey)) {
- includedNamespaces.remove(namespaceKey);
- }
- }
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java
deleted file mode 100644
index f9cb6e4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-public class PackageNameTableContentProvider implements IStructuredContentProvider {
-
- @SuppressWarnings("unchecked")
- public Object[] getElements(Object inputElement) {
- List<Object> elements = new ArrayList<Object>();
- if (inputElement instanceof Definition) {
- Definition definition = (Definition) inputElement;
- Map namespaces = definition.getNamespaces();
- Collection values = namespaces.values();
- for (Object namespaceValue : values) {
- String namespace = namespaceValue.toString();
- if (!namespace.equals(definition.getTargetNamespace()) && !elements.contains(namespace)) {
- elements.add(namespace);
- }
- }
- }
- return elements.toArray(new Object[elements.size()]);
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java
deleted file mode 100644
index 73b094f..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-public class AnnotationsComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Button generateWebMethodButton;
- private Button generateWebParamButton;
- private Button generateRequestWrapperButton;
- private Button generateResponseWrapperButton;
-
- private Button enableAPTButton;
-
- public AnnotationsComposite(Composite parent, int style) {
- super(parent, style);
- addControls();
- }
-
- private void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group jaxwsAnnotationsGroup = new Group(this, SWT.SHADOW_IN);
- jaxwsAnnotationsGroup.setText(CXFUIMessages.JAXWS_ANNOTATIONS_GROUP_LABEL);
- jaxwsAnnotationsGroup.setToolTipText(CXFUIMessages.JAXWS_ANNOTATIONS_GROUP_TOOLTIP);
- GridLayout gridLayout = new GridLayout(1, true);
- jaxwsAnnotationsGroup.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- jaxwsAnnotationsGroup.setLayoutData(gridData);
-
- generateWebMethodButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateWebMethodButton.setText(CXFUIMessages.JAXWS_GENERATE_WEB_METHOD);
- generateWebMethodButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setGenerateWebMethodAnnotation(selected);
- }
- });
- generateWebMethodButton.setSelection(context.isGenerateWebMethodAnnotation());
-
- generateWebParamButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateWebParamButton.setText(CXFUIMessages.JAXWS_GENERATE_WEB_PARAM);
- generateWebParamButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setGenerateWebParamAnnotation(selected);
- }
- });
- generateWebParamButton.setSelection(context.isGenerateWebParamAnnotation());
-
- generateRequestWrapperButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateRequestWrapperButton.setText(CXFUIMessages.JAXWS_GENERATE_REQUEST_WRAPPER);
- generateRequestWrapperButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setGenerateRequestWrapperAnnotation(selected);
- }
- });
- generateRequestWrapperButton.setSelection(context.isGenerateRequestWrapperAnnotation());
-
- generateResponseWrapperButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateResponseWrapperButton.setText(CXFUIMessages.JAXWS_GENERATE_RESPONSE_WRAPPER);
- generateResponseWrapperButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setGenerateResponseWrapperAnnotation(selected);
- }
- });
- generateResponseWrapperButton.setSelection(context.isGenerateResponseWrapperAnnotation());
-
- Group annotationProcessingGroup = new Group(this, SWT.SHADOW_IN);
- annotationProcessingGroup.setText(CXFUIMessages.JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL);
- annotationProcessingGroup.setToolTipText(CXFUIMessages.bind(
- CXFUIMessages.JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP,
- context.getDefaultRuntimeType()));
- gridLayout = new GridLayout(1, true);
- annotationProcessingGroup.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- annotationProcessingGroup.setLayoutData(gridData);
-
- enableAPTButton = new Button(annotationProcessingGroup, SWT.CHECK);
- enableAPTButton.setText(CXFUIMessages.JAXWS_ENABLE_ANNOTATION_PROCESSING);
- enableAPTButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setAnnotationProcessingEnabled(selected);
- }
- });
- enableAPTButton.setSelection(context.isAnnotationProcessingEnabled());
- }
-
- public void setDefaults() {
- generateWebMethodButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION));
-
- generateWebParamButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION));
-
- generateRequestWrapperButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION));
-
- generateResponseWrapperButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION));
-
- enableAPTButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED));
- }
-
- public void storeValues() {
- context.setGenerateWebMethodAnnotation(generateWebMethodButton.getSelection());
- context.setGenerateWebParamAnnotation(generateWebParamButton.getSelection());
- context.setGenerateRequestWrapperAnnotation(generateRequestWrapperButton.getSelection());
- context.setGenerateResponseWrapperAnnotation(generateResponseWrapperButton.getSelection());
- context.setAnnotationProcessingEnabled(enableAPTButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java
deleted file mode 100644
index d4e41f1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-public class BlankRuntimePreferencesComposite extends Composite {
-
- public BlankRuntimePreferencesComposite(Composite parent, int style) {
- super(parent, style);
-
- addControls();
- }
-
- private void addControls() {
- this.setLayout(new GridLayout());
- CLabel setIntallDirLabel = new CLabel(this, SWT.NONE);
- GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
- setIntallDirLabel.setLayoutData(gridData);
- setIntallDirLabel.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(
- ISharedImages.IMG_OBJS_ERROR_TSK));
- setIntallDirLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java
deleted file mode 100644
index 5d1d9c9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public class CXF20WSDL2JavaPreferencesComposite extends Composite {
- WSDL2JavaContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-
- private Button generateServerButton;
- private Button generateImplementationButton;
- private Button processSOAPHeadersButton;
- private Button namespacePackageMappingButton;
- private Button excludesNamespaceMappingButton;
-
- private Button useDefaultValuesButton;
- private Button autoNameResolutionButton;
-
- private Table xjcArgsTable;
-
- private TableItem xjcDefaultValuesTableItem;
- private TableItem xjcToStringTableItem;
- private TableItem xjcToStringMultiLineTableItem;
- private TableItem xjcToStringSimpleTableItem;
- private TableItem xjcLocatorTableItem;
- private TableItem xjcSyncMethodsTableItem;
- private TableItem xjcMarkGeneratedTableItem;
-
- public CXF20WSDL2JavaPreferencesComposite(Composite parent, int style) {
- super(parent, style);
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(this, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(1, true);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- generateServerButton = WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, context);
- generateImplementationButton = WSDL2JavaWidgetFactory.createGenerateImplementationButton(
- wsdl2javaGroup, context);
-
- useDefaultValuesButton = WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, context);
-
- processSOAPHeadersButton = WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup,
- context);
-
- namespacePackageMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(
- wsdl2javaGroup, context);
-
- excludesNamespaceMappingButton = WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(
- wsdl2javaGroup, context);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- autoNameResolutionButton = WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup,
- context);
- }
-
- Group xjcArgGroup = new Group(this, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_GROUP_TITLE);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- xjcDefaultValuesTableItem = WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable,
- context);
- xjcToStringTableItem = WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, context);
- xjcToStringMultiLineTableItem = WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(
- xjcArgsTable, context);
- xjcToStringSimpleTableItem = WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable,
- context);
- xjcLocatorTableItem = WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, context);
- xjcSyncMethodsTableItem = WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, context);
- xjcMarkGeneratedTableItem = WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable,
- context);
- }
-
- public void setDefaults() {
- useDefaultValuesButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
- generateImplementationButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
- processSOAPHeadersButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
- namespacePackageMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
- excludesNamespaceMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
- }
-
- xjcDefaultValuesTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
- xjcToStringTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
- xjcToStringMultiLineTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
- xjcToStringSimpleTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
- xjcLocatorTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
- xjcSyncMethodsTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
- xjcMarkGeneratedTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
- }
-
- public void refresh() {
- useDefaultValuesButton.setSelection(context.isUseDefaultValues());
- generateServerButton.setSelection(context.isGenerateServer());
- generateImplementationButton.setSelection(context.isGenerateImplementation());
- processSOAPHeadersButton.setSelection(context.isProcessSOAPHeaders());
- namespacePackageMappingButton.setSelection(context.isLoadDefaultNamespacePackageNameMapping());
- excludesNamespaceMappingButton.setSelection(context.isLoadDefaultExcludesNamepsaceMapping());
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(context.isAutoNameResolution());
- }
-
- xjcDefaultValuesTableItem.setChecked(context.isXjcUseDefaultValues());
- xjcToStringTableItem.setChecked(context.isXjcToString());
- xjcToStringMultiLineTableItem.setChecked(context.isXjcToStringMultiLine());
- xjcToStringSimpleTableItem.setChecked(context.isXjcToStringSimple());
- xjcLocatorTableItem.setChecked(context.isXjcLocator());
- xjcSyncMethodsTableItem.setChecked(context.isXjcSyncMethods());
- xjcMarkGeneratedTableItem.setChecked(context.isXjcMarkGenerated());
- }
-
- public void storeValues() {
- context.setUseDefaultValues(useDefaultValuesButton.getSelection());
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateImplementation(generateImplementationButton.getSelection());
- context.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
- context.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
- context.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-
- if (canUpdateAutoNameResolution()) {
- context.setAutoNameResolution(autoNameResolutionButton.getSelection());
- }
-
- context.setXjcUseDefaultValues(xjcDefaultValuesTableItem.getChecked());
- context.setXjcToString(xjcToStringTableItem.getChecked());
- context.setXjcToStringMultiLine(xjcToStringMultiLineTableItem.getChecked());
- context.setXjcToStringSimple(xjcToStringSimpleTableItem.getChecked());
- context.setXjcLocator(xjcLocatorTableItem.getChecked());
- context.setXjcSyncMethods(xjcSyncMethodsTableItem.getChecked());
- context.setXjcMarkGenerated(xjcMarkGeneratedTableItem.getChecked());
- }
-
- private boolean canUpdateAutoNameResolution() {
- return autoNameResolutionButton != null && CXFModelUtils.isAutoNameResolutionPermitted();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java
deleted file mode 100644
index 142cb30..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public class CXF21WSDL2JavaPreferencesComposite extends Composite {
- WSDL2JavaContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-
- private Button generateServerButton;
- private Button generateImplementationButton;
- private Button processSOAPHeadersButton;
- private Button namespacePackageMappingButton;
- private Button excludesNamespaceMappingButton;
-
- private Table xjcArgsTable;
-
- private TableItem xjcDefaultValuesTableItem;
- private TableItem xjcToStringTableItem;
- private TableItem xjcToStringMultiLineTableItem;
- private TableItem xjcToStringSimpleTableItem;
- private TableItem xjcLocatorTableItem;
- private TableItem xjcSyncMethodsTableItem;
- private TableItem xjcMarkGeneratedTableItem;
-
- private Button useDefaultValuesButton;
- private Button noAddressBindingButton;
- private Button autoNameResolutionButton;
-
- public CXF21WSDL2JavaPreferencesComposite(Composite parent, int style) {
- super(parent, style);
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(this, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(2, false);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- // Frontend
- // WSDL2JavaWidgetFactory.createFrontendLabel(wsdl2javaGroup);
- // Combo frontendCombo =
- // WSDL2JavaWidgetFactory.createFrontendCombo(wsdl2javaGroup, context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // frontendCombo.setLayoutData(gridData);
-
- // Databinding
- // WSDL2JavaWidgetFactory.createDatabindingLabel(wsdl2javaGroup);
- // Combo databindingCombo =
- // WSDL2JavaWidgetFactory.createDatabindingCombo(wsdl2javaGroup,
- // context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // databindingCombo.setLayoutData(gridData);
-
- // WSDL Version
- // WSDL2JavaWidgetFactory. createWSDLVersionLabel(wsdl2javaGroup);
- // Combo wsdlVersionCombo =
- // WSDL2JavaWidgetFactory.createWSDLVersionCombo(wsdl2javaGroup,
- // context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // wsdlVersionCombo.setLayoutData(gridData);
-
- generateServerButton = WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- generateServerButton.setLayoutData(gridData);
-
- generateImplementationButton = WSDL2JavaWidgetFactory.createGenerateImplementationButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- generateImplementationButton.setLayoutData(gridData);
-
- useDefaultValuesButton = WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- useDefaultValuesButton.setLayoutData(gridData);
-
- processSOAPHeadersButton = WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup,
- context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- processSOAPHeadersButton.setLayoutData(gridData);
-
- namespacePackageMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- namespacePackageMappingButton.setLayoutData(gridData);
-
- excludesNamespaceMappingButton = WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- excludesNamespaceMappingButton.setLayoutData(gridData);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- autoNameResolutionButton = WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- autoNameResolutionButton.setLayoutData(gridData);
- }
-
- noAddressBindingButton = WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- noAddressBindingButton.setLayoutData(gridData);
-
- Group xjcArgGroup = new Group(this, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_GROUP_TITLE);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- xjcDefaultValuesTableItem = WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable,
- context);
- xjcToStringTableItem = WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, context);
- xjcToStringMultiLineTableItem = WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(
- xjcArgsTable, context);
- xjcToStringSimpleTableItem = WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable,
- context);
- xjcLocatorTableItem = WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, context);
- xjcSyncMethodsTableItem = WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, context);
- xjcMarkGeneratedTableItem = WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable,
- context);
- }
-
- public void setDefaults() {
- useDefaultValuesButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
- noAddressBindingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
- generateImplementationButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
-
- processSOAPHeadersButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
-
- namespacePackageMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
-
- excludesNamespaceMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
- }
-
- xjcDefaultValuesTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
-
- xjcToStringTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
-
- xjcToStringMultiLineTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
-
- xjcToStringSimpleTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
-
- xjcLocatorTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
-
- xjcSyncMethodsTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
-
- xjcMarkGeneratedTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
- }
-
- public void refresh() {
- useDefaultValuesButton.setSelection(context.isUseDefaultValues());
- noAddressBindingButton.setSelection(context.isNoAddressBinding());
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(context.isAutoNameResolution());
- }
-
- generateServerButton.setSelection(context.isGenerateServer());
- generateImplementationButton.setSelection(context.isGenerateImplementation());
- processSOAPHeadersButton.setSelection(context.isProcessSOAPHeaders());
- namespacePackageMappingButton.setSelection(context.isLoadDefaultNamespacePackageNameMapping());
- excludesNamespaceMappingButton.setSelection(context.isLoadDefaultExcludesNamepsaceMapping());
-
- xjcDefaultValuesTableItem.setChecked(context.isXjcUseDefaultValues());
- xjcToStringTableItem.setChecked(context.isXjcToString());
- xjcToStringMultiLineTableItem.setChecked(context.isXjcToStringMultiLine());
- xjcToStringSimpleTableItem.setChecked(context.isXjcToStringSimple());
- xjcLocatorTableItem.setChecked(context.isXjcLocator());
- xjcSyncMethodsTableItem.setChecked(context.isXjcSyncMethods());
- xjcMarkGeneratedTableItem.setChecked(context.isXjcMarkGenerated());
- }
-
- public void storeValues() {
- context.setUseDefaultValues(useDefaultValuesButton.getSelection());
- context.setNoAddressBinding(noAddressBindingButton.getSelection());
-
- if (canUpdateAutoNameResolution()) {
- context.setAutoNameResolution(autoNameResolutionButton.getSelection());
- }
-
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateImplementation(generateImplementationButton.getSelection());
- context.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
- context.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
- context.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-
- context.setXjcUseDefaultValues(xjcDefaultValuesTableItem.getChecked());
- context.setXjcToString(xjcToStringTableItem.getChecked());
- context.setXjcToStringMultiLine(xjcToStringMultiLineTableItem.getChecked());
- context.setXjcToStringSimple(xjcToStringSimpleTableItem.getChecked());
- context.setXjcLocator(xjcLocatorTableItem.getChecked());
- context.setXjcSyncMethods(xjcSyncMethodsTableItem.getChecked());
- context.setXjcMarkGenerated(xjcMarkGeneratedTableItem.getChecked());
- }
-
- private boolean canUpdateAutoNameResolution() {
- return autoNameResolutionButton != null && CXFModelUtils.isAutoNameResolutionPermitted();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java
deleted file mode 100644
index ebb5ead..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-
-public class Java2WSDLRuntimePreferencesComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Combo soapBindingCombo;
- private Button createXSDImportsButton;
- private TabFolder tabFolder;
-
- public Java2WSDLRuntimePreferencesComposite(Composite parent, int style, TabFolder tabFolder) {
- super(parent, style);
- this.tabFolder = tabFolder;
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group java2wsdlGroup = new Group(this, SWT.SHADOW_IN);
- java2wsdlGroup.setText(CXFUIMessages.JAVA2WSDL_GROUP_LABEL);
- GridLayout java2wslayout = new GridLayout();
- java2wslayout.numColumns = 2;
- java2wsdlGroup.setLayout(java2wslayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- java2wsdlGroup.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createSOAPBindingLabel(java2wsdlGroup);
-
- soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(java2wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- soapBindingCombo.setLayoutData(gridData);
-
- createXSDImportsButton = Java2WSWidgetFactory.createXSDImportsButton(java2wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- createXSDImportsButton.setLayoutData(gridData);
-
- Link link = new Link(this, SWT.NONE);
- link.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_LINK);
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- tabFolder.setSelection(3);
- }
- });
- }
-
- public void setDefaults() {
- if (CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING)) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
- }
-
- public void refresh() {
- if (context.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
- createXSDImportsButton.setSelection(context.isGenerateXSDImports());
- }
-
- public void storeValues() {
- if (soapBindingCombo.getText().equals("SOAP 1.2")) {
- context.setSoap12Binding(true);
- } else {
- context.setSoap12Binding(false);
- }
-
- context.setGenerateXSDImports(createXSDImportsButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java
deleted file mode 100644
index 9d62ffe..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-
-public class Java2WSRuntimePreferencesComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Combo soapBindingCombo;
- private Button createXSDImportsButton;
-
- private Button generateClientButton;
- private Button generateServerButton;
- private Button generateWrapperFaultBeanButton;
- private Button generateWSDLButton;
-
- private TabFolder tabFolder;
-
- public Java2WSRuntimePreferencesComposite(Composite parent, int style, TabFolder tabFolder) {
- super(parent, style);
- this.tabFolder = tabFolder;
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout();
-
- preflayout.numColumns = 2;
- preflayout.marginHeight = 10;
- this.setLayout(preflayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- // Java2WS Group
- Group java2wsGroup = new Group(this, SWT.SHADOW_IN);
- java2wsGroup.setText(CXFUIMessages.JAVA2WS_GROUP_LABEL);
- GridLayout java2wslayout = new GridLayout();
-
- java2wslayout.numColumns = 3;
-
- java2wslayout.marginHeight = 10;
- java2wsGroup.setLayout(java2wslayout);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- java2wsGroup.setLayoutData(gridData);
-
- // Frontend
- Java2WSWidgetFactory.createFrontendLabel(java2wsGroup);
- Combo frontendCombo = Java2WSWidgetFactory.createFrontendCombo(java2wsGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- frontendCombo.setLayoutData(gridData);
-
- // Databinding
- Java2WSWidgetFactory.createDatabindingLabel(java2wsGroup);
- Combo databindingCombo = Java2WSWidgetFactory.createDatabindingCombo(java2wsGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- databindingCombo.setLayoutData(gridData);
-
- // Gen Client
- generateClientButton = Java2WSWidgetFactory.createGenerateClientButton(java2wsGroup, context);
-
- // Gen Server
- generateServerButton = Java2WSWidgetFactory.createGenerateServerButton(java2wsGroup, context);
-
- // Gen Wrapper and Fault Bean
- generateWrapperFaultBeanButton = Java2WSWidgetFactory.createGenerateWrapperFaultBeanButton(
- java2wsGroup, context);
-
- // Gen WSDL
- generateWSDLButton = Java2WSWidgetFactory.createGenerateWSDLButton(java2wsGroup, context);
- generateWSDLButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- enableWSDLGroup(generateWSDLButton.getSelection());
- }
- });
-
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 3;
- generateWSDLButton.setLayoutData(gridData);
-
- Group wsdlGroup = new Group(java2wsGroup, SWT.SHADOW_ETCHED_IN);
- GridLayout wsdlGroupLayout = new GridLayout(2, false);
- wsdlGroup.setLayout(wsdlGroupLayout);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 3;
- wsdlGroup.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createSOAPBindingLabel(wsdlGroup);
-
- soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- soapBindingCombo.setLayoutData(gridData);
-
- createXSDImportsButton = Java2WSWidgetFactory.createXSDImportsButton(wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- createXSDImportsButton.setLayoutData(gridData);
-
- Link link = new Link(this, SWT.NONE);
- link.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_LINK);
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- tabFolder.setSelection(3);
- }
- });
- enableWSDLGroup(context.isGenerateWSDL());
- }
-
- protected void enableWSDLGroup(boolean enable) {
- soapBindingCombo.setEnabled(enable);
- createXSDImportsButton.setEnabled(enable);
- }
-
- public void setDefaults() {
- if (CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING)) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
-
- generateClientButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
- generateWrapperFaultBeanButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS));
-
- generateWSDLButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL));
- }
-
- public void refresh() {
- if (context.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(context.isGenerateXSDImports());
- generateClientButton.setSelection(context.isGenerateClient());
- generateServerButton.setSelection(context.isGenerateServer());
- generateWrapperFaultBeanButton.setSelection(context.isGenerateWrapperFaultBeans());
- generateWSDLButton.setSelection(context.isGenerateWSDL());
- }
-
- public void storeValues() {
- if (soapBindingCombo.getText().equals("SOAP 1.2")) {
- context.setSoap12Binding(true);
- } else {
- context.setSoap12Binding(false);
- }
-
- context.setGenerateXSDImports(createXSDImportsButton.getSelection());
- context.setGenerateClient(generateClientButton.getSelection());
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateWrapperFaultBeans(generateWrapperFaultBeanButton.getSelection());
- context.setGenerateWSDL(generateWSDLButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java
deleted file mode 100644
index 1f4cca1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.JavaViewerFilter;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * Provides widgets for Java2WS preferences, wizards, dialogs. Enables the reuse
- * of widgets in multiple locations. Widgets have there labeling and tooltips
- * set here and where possible listeners are set which update instances of
- * <code>Java2WSContext</code> and <code>Java2WSDataModel</code>.
- *
- */
-public final class Java2WSWidgetFactory {
-
- private Java2WSWidgetFactory() {
- }
-
- public static Label createSOAPBindingLabel(Composite parent) {
- Label defaultSoapBinding = new Label(parent, SWT.NONE);
- defaultSoapBinding.setText(CXFUIMessages.JAVA2WS_DEFAULT_SOAPBINDING_LABEL);
- return defaultSoapBinding;
- }
-
- public static Combo createSOAPBingCombo(Composite parent, final Java2WSContext context) {
- Combo soapBindingCombo = new Combo(parent, SWT.READ_ONLY);
- soapBindingCombo.setToolTipText(CXFUIMessages.JAVA2WS_SOAP12_BINDING_TOOLTIP);
- soapBindingCombo.add("SOAP 1.1"); //$NON-NLS-1$
- soapBindingCombo.add("SOAP 1.2"); //$NON-NLS-1$
- soapBindingCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- String soapBinding = ((Combo) e.widget).getText();
- if (soapBinding.equals("SOAP 1.2")) { //$NON-NLS-1$
- context.setSoap12Binding(true);
- } else {
- context.setSoap12Binding(false);
- }
- }
- });
- if (context.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- return soapBindingCombo;
- }
-
- public static Button createXSDImportsButton(Composite parent, final Java2WSContext context) {
- Button createXSDImports = new Button(parent, SWT.CHECK);
- createXSDImports.setText(CXFUIMessages.JAVA2WS_GEN_XSD_IMPORTS);
- createXSDImports.setToolTipText(CXFUIMessages.JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP);
- createXSDImports.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateXSDImports(((Button) e.widget).getSelection());
- }
- });
- createXSDImports.setSelection(context.isGenerateXSDImports());
- return createXSDImports;
- }
-
- public static Label createFrontendLabel(Composite parent) {
- Label frontendLabel = new Label(parent, SWT.NONE);
- frontendLabel.setText(CXFUIMessages.CXF_DEFAULT_FRONTEND_LABEL);
- return frontendLabel;
- }
-
- public static Combo createFrontendCombo(Composite parent, final Java2WSContext context) {
- final Combo frontendCombo = new Combo(parent, SWT.READ_ONLY);
- frontendCombo.setToolTipText(CXFUIMessages.JAVA2WS_FRONTEND_TOOLTIP);
- frontendCombo.add(Frontend.JAXWS.getLiteral());
- frontendCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- String frontend = frontendCombo.getText();
- context.setFrontend(Frontend.get(frontend));
- if (frontend.equals(Frontend.JAXWS.getLiteral())) {
- context.setDatabinding(DataBinding.get(DataBinding.JAXB.getLiteral()));
- }
- // if (frontend.equals("simple")) {
- // context.setDatabinding("aegis");
- // }
- }
- });
- frontendCombo.setText(context.getFrontend().getLiteral());
-
- return frontendCombo;
- }
-
- public static Label createDatabindingLabel(Composite parent) {
- Label databindingLabel = new Label(parent, SWT.NONE);
- databindingLabel.setText(CXFUIMessages.CXF_DEFAULT_DATABINDING_LABEL);
- return databindingLabel;
- }
-
- public static Combo createDatabindingCombo(Composite parent, final Java2WSContext context) {
- final Combo databindingCombo = new Combo(parent, SWT.READ_ONLY);
- databindingCombo.setToolTipText(CXFUIMessages.JAVA2WS_DATABINDING_TOOLTIP);
- databindingCombo.add(DataBinding.JAXB.getLiteral());
- databindingCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- context.setDatabinding(DataBinding.get(databindingCombo.getText()));
- }
- });
- databindingCombo.setText(context.getDatabinding().getLiteral());
- return databindingCombo;
- }
-
- public static Button createGenerateClientButton(Composite parent, final Java2WSContext context) {
- final Button genClientButton = new Button(parent, SWT.CHECK);
- genClientButton.setText(CXFUIMessages.JAVA2WS_GEN_CLIENT_LABEL);
- genClientButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_CLIENT_TOOLTIP);
- genClientButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateClient(genClientButton.getSelection());
- }
- });
- genClientButton.setSelection(context.isGenerateClient());
- return genClientButton;
- }
-
- public static Button createGenerateServerButton(Composite parent, final Java2WSContext context) {
- final Button genServerButton = new Button(parent, SWT.CHECK);
- genServerButton.setText(CXFUIMessages.JAVA2WS_GEN_SERVER_LABEL);
- genServerButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_SERVER_TOOLTIP);
- genServerButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateServer(genServerButton.getSelection());
- }
- });
- genServerButton.setSelection(context.isGenerateServer());
- return genServerButton;
- }
-
- public static Button createGenerateWrapperFaultBeanButton(Composite parent, final Java2WSContext context) {
- final Button genWrapperFaultButton = new Button(parent, SWT.CHECK);
- genWrapperFaultButton.setText(CXFUIMessages.JAVA2WS_GEN_WRAPPER_FAULT_LABEL);
- genWrapperFaultButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP);
- genWrapperFaultButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateWrapperFaultBeans(genWrapperFaultButton.getSelection());
- }
- });
- genWrapperFaultButton.setSelection(context.isGenerateWrapperFaultBeans());
- return genWrapperFaultButton;
- }
-
- public static Button createGenerateWSDLButton(Composite parent, final Java2WSContext context) {
- final Button genWSDLButton = new Button(parent, SWT.CHECK);
- genWSDLButton.setText(CXFUIMessages.JAVA2WS_GEN_WSDL_LABEL);
- genWSDLButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_WSDL_TOOLTIP);
- genWSDLButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateWSDL(genWSDLButton.getSelection());
- }
- });
- genWSDLButton.setSelection(context.isGenerateWSDL());
- return genWSDLButton;
- }
-
- public static Label createWSDLFileNameLabel(Composite parent) {
- Label wsdlFileNameLabel = new Label(parent, SWT.NONE);
- wsdlFileNameLabel.setText(CXFUIMessages.JAVA2WS_WSDL_FILE_NAME);
- return wsdlFileNameLabel;
-
- }
-
- public static Text createWSDLFileNameText(Composite parent, final Java2WSDataModel model) {
- final Text wsdlFileText = new Text(parent, SWT.BORDER);
- wsdlFileText.setToolTipText(CXFUIMessages.JAVA2WS_OUTPUT_FILE_TOOLTIP);
- wsdlFileText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- model.setWsdlFileName(wsdlFileText.getText());
- }
- });
- wsdlFileText.setText(model.getWsdlFileName());
- return wsdlFileText;
- }
-
- public static Button createUseSEIButton(Composite parent) {
- Button useSEIButton = new Button(parent, SWT.CHECK);
- useSEIButton.setText(CXFUIMessages.JAVA2WS_USE_SEI_BUTTON);
- return useSEIButton;
- }
-
- // public static Label createInformationLabel(Composite parent, IType startingPointType) {
- // Label infoLabel = new Label(parent, SWT.WRAP);
- // infoLabel.setText(CXFUIMessages.bind(CXFUIMessages.JAVA2WS_USE_SEI_INFO_LABEL, startingPointType
- // .getElementName()));
- // return infoLabel;
- // }
-
- public static Label createPaddingLabel(Composite parent) {
- return new Label(parent, SWT.NONE);
- }
-
- public static Button createSelectSEIButton(Composite parent) {
- Button selectSEIButton = new Button(parent, SWT.RADIO);
- selectSEIButton.setText(CXFUIMessages.JAVA2WS_SELECT_SEI_LABEL);
- return selectSEIButton;
- }
-
- public static Label createSelectSEILabel(Composite parent) {
- Label selectSEILabel = new Label(parent, SWT.NONE);
- selectSEILabel.setText(CXFUIMessages.JAVA2WS_SELECT_SEI_LABEL);
- return selectSEILabel;
- }
-
- public static Combo createSelectSEICombo(Composite parent, final Java2WSDataModel model,
- IType javaStartingPointType) {
- final Combo seiCombo = new Combo(parent, SWT.BORDER);
- seiCombo.setToolTipText(CXFUIMessages.JAVA2WS_SELECT_SEI_TOOLTIP);
-
- IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
- try {
- ITypeHierarchy typeHierarchy = javaStartingPointType.newTypeHierarchy(javaProject, null);
- IType[] allInterfaces = typeHierarchy.getAllInterfaces();
- for (int i = 0; i < allInterfaces.length; i++) {
- IType itype = allInterfaces[i];
- if (!itype.isBinary() && itype.getResource().getProject().equals(javaProject.getProject())) {
- seiCombo.add(itype.getFullyQualifiedName());
- }
- }
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
-
- seiCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- String seiInterfaceName = seiCombo.getText();
- model.setFullyQualifiedJavaInterfaceName(seiInterfaceName);
- }
- });
-
- seiCombo.deselectAll();
- return seiCombo;
- }
-
- public static Button createBrowseButton(Composite parent) {
- Button browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(CXFUIMessages.JAVA2WS_BROWSE_LABEL);
- return browseButton;
- }
-
- public static Button createExtractSEIButton(Composite parent) {
- Button extractSEIButton = new Button(parent, SWT.RADIO);
- extractSEIButton.setText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_LABEL);
- return extractSEIButton;
- }
-
- public static Label createExtractSEILabel(Composite parent) {
- Label extractSEILabel = new Label(parent, SWT.NONE);
- extractSEILabel.setText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_LABEL);
- return extractSEILabel;
- }
-
- public static Text createSEIInterfaceNameText(Composite parent) {
- Text seiInterfaceNameText = new Text(parent, SWT.BORDER);
- seiInterfaceNameText.setToolTipText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_TOOLTIP);
- return seiInterfaceNameText;
- }
-
- public static Label createMemebersToExtractLabel(Composite parent) {
- Label seiMembersToExtractLabel = new Label(parent, SWT.NONE);
- seiMembersToExtractLabel.setText(CXFUIMessages.JAVA2WS_EXTRACT_MEMBERS_LABEL);
- return seiMembersToExtractLabel;
- }
-
- public static CheckboxTableViewer createSEIMembersToExtractTableViewer(Composite parent) {
- CheckboxTableViewer seiMembersToExtractTableViewer = CheckboxTableViewer.newCheckList(parent,
- SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- seiMembersToExtractTableViewer.setLabelProvider(new JavaElementLabelProvider());
- seiMembersToExtractTableViewer.setContentProvider(new ArrayContentProvider());
- return seiMembersToExtractTableViewer;
- }
-
- public static Button createSelectAllButton(Composite parent) {
- Button selectAllButton = new Button(parent, SWT.PUSH);
- selectAllButton.setText(CXFUIMessages.JAVA2WS_SELECT_ALL_BUTTON);
- return selectAllButton;
- }
-
- public static Button createDeselectAllButton(Composite parent) {
- Button deselectAllButton = new Button(parent, SWT.PUSH);
- deselectAllButton.setText(CXFUIMessages.JAVA2WS_DESELECT_ALL_BUTTON);
- return deselectAllButton;
- }
-
- public static Label createSelectImplementationLabel(Composite parent) {
- Label selectImplementationLabel = new Label(parent, SWT.NONE);
- selectImplementationLabel.setText(CXFUIMessages.JAVA2WS_SELECT_IMPLEMENTATION);
- return selectImplementationLabel;
- }
-
- public static Combo createSelectImplementationCombo(Composite parent,
- final Java2WSDataModel model, IType javaStartingPointType) {
- final Combo selectImplementationCombo = new Combo(parent, SWT.BORDER);
- selectImplementationCombo.setToolTipText(CXFUIMessages.JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP);
-
- IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
- try {
- ITypeHierarchy typeHierarchy = javaStartingPointType.newTypeHierarchy(javaProject, null);
- IType[] allImplementations = typeHierarchy.getAllSubtypes(javaStartingPointType);
- for (int i = 0; i < allImplementations.length; i++) {
- IType itype = allImplementations[i];
- if (!itype.isBinary() && itype.getResource().getProject().equals(javaProject.getProject())) {
- String packageName = itype.getPackageFragment().getElementName();
- if (packageName.trim().length() > 0) {
- packageName += "."; //$NON-NLS-1$
- }
- String qualifiedName = packageName + itype.getPrimaryElement().getElementName();
- selectImplementationCombo.add(qualifiedName);
- }
- }
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
-
- selectImplementationCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- String implementationName = selectImplementationCombo.getText();
- model.setFullyQualifiedJavaClassName(implementationName);
- }
- });
-
- selectImplementationCombo.deselectAll();
- return selectImplementationCombo;
- }
-
- /**
- * Creates an <code>ElementTreeSelectionDialog</code> that displays all the classes or all the interfaces
- * within a <code>IJavaProject</code> allowing one class or interface to be selected.
- *
- * @param parent the parent shell
- * @param title the dialog title
- * @param message the dialog message
- * @param javaProject the java project that is filtered
- * @param elementKinds a flag defining nature of searched elements; the only valid values are:
- * <code>IJavaSearchConstants.CLASS</code>
- * <code>IJavaSearchConstants.INTERFACE</code>
- * <code>IJavaSearchConstants.CLASS_AND_INTERFACE</code>
- *
- * @return the element tree selection dialog
- */
- public static ElementTreeSelectionDialog createElementTreeSelectionDialog(Shell parent, String title,
- String message, IJavaProject javaProject, int elementKinds) {
- ElementTreeSelectionDialog selectionDialog = new ElementTreeSelectionDialog(parent,
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- selectionDialog.setTitle(title);
- selectionDialog.setMessage(message);
- selectionDialog.setAllowMultiple(false);
- selectionDialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
-
- selectionDialog.addFilter(new JavaViewerFilter(javaProject, elementKinds));
-
- selectionDialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- return new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
- return new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- });
-
- return selectionDialog;
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java
deleted file mode 100644
index d04358c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-public class SpringConfigComposite extends Composite {
- private CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Button useCXFServletButton;
- private Button useSpringAppContextButton;
-
- public SpringConfigComposite(Composite parent, int style) {
- super(parent, style);
- addControls();
- }
-
- private void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group springConfigGroup = new Group(this, SWT.SHADOW_IN);
- springConfigGroup.setText(CXFUIMessages.SPRING_CONFIG_GROUP_LABEL);
- GridLayout springConfigLayout = new GridLayout(2, true);
- springConfigGroup.setLayout(springConfigLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- springConfigGroup.setLayoutData(gridData);
-
- useCXFServletButton = new Button(springConfigGroup, SWT.RADIO);
- useCXFServletButton.setText(CXFUIMessages.SPRING_CONFIG_USE_CXF_SERVLET);
- useCXFServletButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setUseSpringApplicationContext(!selected);
- }
- });
-
- useSpringAppContextButton = new Button(springConfigGroup, SWT.RADIO);
- useSpringAppContextButton
- .setText(CXFUIMessages.SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT);
- useSpringAppContextButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setUseSpringApplicationContext(selected);
- }
- });
-
- if (context.isUseSpringApplicationContext()) {
- useSpringAppContextButton.setSelection(true);
- } else {
- useCXFServletButton.setSelection(true);
- }
- }
-
- public void setDefaults() {
- boolean useSpringAppcontext = CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT);
- useSpringAppContextButton.setSelection(useSpringAppcontext);
- useCXFServletButton.setSelection(!useSpringAppcontext);
- }
-
- public void storeValues() {
- context.setUseSpringApplicationContext(useSpringAppContextButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
deleted file mode 100644
index 7e4cac7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.dialogs.ResourceSelectionDialog;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameColumnLabelProvider;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * Provides widgets for WSDL2Java preferences, wizards, dialogs. Enables the
- * reuse of widgets in multiple locations. Widgets have there labeling and
- * tooltips set here and where possible listeners are set which update instances
- * of <code>WSDL2JavaContext</code> and <code>WSDL2JavaDataModel</code>.
- *
- */
-public final class WSDL2JavaWidgetFactory {
- private static final String XJC_DV_ARG = "-Xdv"; //$NON-NLS-1$
- private static final String XJC_TS_ARG = "-Xts"; //$NON-NLS-1$
- private static final String XJC_TS_MULTI_ARG = "-Xts:style:multiline"; //$NON-NLS-1$
- private static final String XJC_TS_SIMPLE = "-Xts:style:simple"; //$NON-NLS-1$
- private static final String XJC_LOCATOR_ARG = "-Xlocator"; //$NON-NLS-1$
- private static final String XJC_SYNC_METHODS_ARG = "-Xsync-methods"; //$NON-NLS-1$
- private static final String XJC_MARK_GENERATED_ARG = "-mark-generated"; //$NON-NLS-1$
- private static final String XJC_EPISODE_FILE_ARG = "-episode"; //$NON-NLS-1$
-
- private WSDL2JavaWidgetFactory() {
- }
-
- public static Button createGenerateClientButton(Composite parent, final WSDL2JavaContext model) {
- final Button genClientButton = new Button(parent, SWT.CHECK);
- genClientButton.setText(CXFUIMessages.JAVA2WS_GEN_CLIENT_LABEL);
- genClientButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_CLIENT_TOOLTIP);
- genClientButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setGenerateClient(genClientButton.getSelection());
- }
- });
- genClientButton.setSelection(model.isGenerateClient());
- return genClientButton;
- }
-
- public static Button createGenerateServerButton(Composite parent, final WSDL2JavaContext model) {
- final Button genServerButton = new Button(parent, SWT.CHECK);
- genServerButton.setText(CXFUIMessages.JAVA2WS_GEN_SERVER_LABEL);
- genServerButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_SERVER_TOOLTIP);
- genServerButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setGenerateServer(genServerButton.getSelection());
- }
- });
- genServerButton.setSelection(model.isGenerateServer());
- return genServerButton;
- }
-
- public static Button createGenerateImplementationButton(Composite parent, final WSDL2JavaContext model) {
- final Button genImplementatinButton = new Button(parent, SWT.CHECK);
- genImplementatinButton.setText(CXFUIMessages.JAVA2WS_GEN_IMPLEMENTATION_LABEL);
- genImplementatinButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP);
- genImplementatinButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setGenerateImplementation(genImplementatinButton.getSelection());
- }
- });
- genImplementatinButton.setSelection(model.isGenerateImplementation());
- return genImplementatinButton;
- }
-
- public static Button createProcessSOAPHeadersButton(Composite parent, final WSDL2JavaContext model) {
- final Button processSOAPHeadersButton = new Button(parent, SWT.CHECK);
- processSOAPHeadersButton.setText(CXFUIMessages.WSDL2JAVA_PROCESS_SOAP_HEADERS);
- processSOAPHeadersButton.setToolTipText(CXFUIMessages.WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP);
- processSOAPHeadersButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
- }
- });
- processSOAPHeadersButton.setSelection(model.isProcessSOAPHeaders());
- return processSOAPHeadersButton;
- }
-
- public static Button createNamespacePackageMappingButton(Composite parent, final WSDL2JavaContext model) {
- final Button namespacePackageMappingButton = new Button(parent, SWT.CHECK);
- namespacePackageMappingButton
- .setText(CXFUIMessages.WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING);
- namespacePackageMappingButton
- .setToolTipText(CXFUIMessages.WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP);
- namespacePackageMappingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
- }
- });
- namespacePackageMappingButton.setSelection(model.isLoadDefaultNamespacePackageNameMapping());
- return namespacePackageMappingButton;
- }
-
- public static Button createExcludesNamespaceMappingButton(Composite parent, final WSDL2JavaContext model) {
- final Button excludesNamespaceMappingButton = new Button(parent, SWT.CHECK);
- excludesNamespaceMappingButton
- .setText(CXFUIMessages.WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING);
- excludesNamespaceMappingButton
- .setToolTipText(CXFUIMessages.WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP);
- excludesNamespaceMappingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
- }
- });
- excludesNamespaceMappingButton.setSelection(model.isLoadDefaultExcludesNamepsaceMapping());
- return excludesNamespaceMappingButton;
- }
-
- public static Button createNoAddressBindingButton(Composite parent, final WSDL2JavaContext model) {
- final Button noAddressBindingButton = new Button(parent, SWT.CHECK);
- noAddressBindingButton.setText(CXFUIMessages.bind(CXFUIMessages.WSDL2JAVA_NO_ADDRESS_BINDING,
- model.getDefaultRuntimeType()));
- noAddressBindingButton.setToolTipText(
- CXFUIMessages.bind(CXFUIMessages.WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP,
- model.getDefaultRuntimeType()));
- noAddressBindingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setNoAddressBinding(noAddressBindingButton.getSelection());
- }
- });
- noAddressBindingButton.setSelection(model.isNoAddressBinding());
- return noAddressBindingButton;
- }
-
- public static Button createAutoNameResolutionButton(Composite parent, final WSDL2JavaContext model) {
- final Button autoNameResolutionButton = new Button(parent, SWT.CHECK);
- autoNameResolutionButton.setText(CXFUIMessages.WSDL2JAVA_AUTO_NAME_RESOLUTION);
- autoNameResolutionButton.setToolTipText(CXFUIMessages.WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP);
- autoNameResolutionButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setAutoNameResolution(autoNameResolutionButton.getSelection());
- }
- });
- autoNameResolutionButton.setSelection(model.isAutoNameResolution());
- return autoNameResolutionButton;
- }
-
- public static TableItem createXJCDefaultValuesTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcDefaultValuesItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcDefaultValuesItem.setText(0, XJC_DV_ARG);
- xjcDefaultValuesItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_DEFAULT_VALUES);
- xjcDefaultValuesItem.setChecked(model.isXjcUseDefaultValues());
- return xjcDefaultValuesItem;
- }
-
- public static TableItem createXJCToStringTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcToStringItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcToStringItem.setText(0, XJC_TS_ARG);
- xjcToStringItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING);
- xjcToStringItem.setChecked(model.isXjcToString());
- return xjcToStringItem;
- }
-
- public static TableItem createXJCToStringMultiLineTableItem(Table xjcArgsTable,
- final WSDL2JavaContext model) {
- TableItem xjcToStringMultiLineItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcToStringMultiLineItem.setText(0, XJC_TS_MULTI_ARG);
- xjcToStringMultiLineItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING_MULTILINE);
- xjcToStringMultiLineItem.setChecked(model.isXjcToStringMultiLine());
- return xjcToStringMultiLineItem;
- }
-
- public static TableItem createXJCToStringSimpleTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcToStringSimpleItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcToStringSimpleItem.setText(0, XJC_TS_SIMPLE);
- xjcToStringSimpleItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING_SIMPLE);
- xjcToStringSimpleItem.setChecked(model.isXjcToStringSimple());
- return xjcToStringSimpleItem;
- }
-
- public static TableItem createXJCLocatorTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcLocatorItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcLocatorItem.setText(0, XJC_LOCATOR_ARG);
- xjcLocatorItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_LOCATOR);
- xjcLocatorItem.setChecked(model.isXjcLocator());
- return xjcLocatorItem;
- }
-
- public static TableItem createXJCSyncMethodsTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcSyncMethodsItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcSyncMethodsItem.setText(0, XJC_SYNC_METHODS_ARG);
- xjcSyncMethodsItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_SYNC_METHODS);
- xjcSyncMethodsItem.setChecked(model.isXjcSyncMethods());
- return xjcSyncMethodsItem;
- }
-
- public static TableItem createXJCMarkGeneratedTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcMarkGeneratedItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcMarkGeneratedItem.setText(0, XJC_MARK_GENERATED_ARG);
- xjcMarkGeneratedItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_MARK_GENERATED);
- xjcMarkGeneratedItem.setChecked(model.isXjcMarkGenerated());
- return xjcMarkGeneratedItem;
- }
-
- public static TableItem createXJCEpisodeFileTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcEpisodeFileItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcEpisodeFileItem.setText(0, XJC_EPISODE_FILE_ARG);
- xjcEpisodeFileItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_EPISODE_FILE);
- return xjcEpisodeFileItem;
- }
-
- public static Table createXJCArgTable(Composite parent, final WSDL2JavaContext model) {
- Table xjcArgsTable = new Table(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION);
- xjcArgsTable.setToolTipText(CXFUIMessages.WSDL2JAVA_XJC_ARGS_TOOLTIP);
- xjcArgsTable.setLinesVisible(true);
- xjcArgsTable.setHeaderVisible(true);
-
- TableLayout tableLayout = new TableLayout();
- xjcArgsTable.setLayout(tableLayout);
-
- TableColumn xjcArgColumn = new TableColumn(xjcArgsTable, SWT.NONE);
- xjcArgColumn.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_COLUMN_NAME);
-
- ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- TableColumn descriptionColumn = new TableColumn(xjcArgsTable, SWT.NONE);
- descriptionColumn.setText(CXFUIMessages.WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME);
- columnWeightData = new ColumnWeightData(200, 200, true);
- tableLayout.addColumnData(columnWeightData);
-
- xjcArgsTable.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- if (event.detail == SWT.CHECK) {
- TableItem tableItem = (TableItem) event.item;
- String xjcArg = tableItem.getText(0);
- boolean checked = tableItem.getChecked();
- if (xjcArg.equals(XJC_DV_ARG)) {
- model.setXjcUseDefaultValues(checked);
- }
-
- if (xjcArg.equals(XJC_TS_ARG)) {
- model.setXjcToString(checked);
- }
-
- if (xjcArg.equals(XJC_TS_MULTI_ARG)) {
- model.setXjcToStringMultiLine(checked);
- }
-
- if (xjcArg.equals(XJC_TS_SIMPLE)) {
- model.setXjcToStringSimple(checked);
- }
-
- if (xjcArg.equals(XJC_LOCATOR_ARG)) {
- model.setXjcLocator(checked);
- }
-
- if (xjcArg.equals(XJC_SYNC_METHODS_ARG)) {
- model.setXjcSyncMethods(checked);
- }
-
- if (xjcArg.equals(XJC_MARK_GENERATED_ARG)) {
- model.setXjcMarkGenerated(checked);
- }
- }
- }
-
- });
-
- xjcArgColumn.pack();
- descriptionColumn.pack();
-
- return xjcArgsTable;
- }
-
- public static Label createFrontendLabel(Composite parent) {
- Label frontendLabel = new Label(parent, SWT.NONE);
- frontendLabel.setText(CXFUIMessages.CXF_DEFAULT_FRONTEND_LABEL);
- return frontendLabel;
- }
-
- public static Combo createFrontendCombo(Composite parent, final WSDL2JavaContext model) {
- final Combo frontendCombo = new Combo(parent, SWT.READ_ONLY);
- frontendCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_FRONTEND_TOOLTIP);
- frontendCombo.add(model.getFrontend().getLiteral());
- frontendCombo.setEnabled(false);
- frontendCombo.select(0);
- return frontendCombo;
- }
-
- public static Label createDatabindingLabel(Composite parent) {
- Label databindingLabel = new Label(parent, SWT.NONE);
- databindingLabel.setText(CXFUIMessages.CXF_DEFAULT_DATABINDING_LABEL);
- return databindingLabel;
- }
-
- public static Combo createDatabindingCombo(Composite parent, final WSDL2JavaContext model) {
- final Combo databindingCombo = new Combo(parent, SWT.READ_ONLY);
- databindingCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_DATABINDING_TOOLTIP);
- databindingCombo.add(model.getDatabinding().getLiteral());
- databindingCombo.setEnabled(false);
- databindingCombo.select(0);
- return databindingCombo;
- }
-
- public static Label createWSDLVersionLabel(Composite parent) {
- Label wsdlVersionLabel = new Label(parent, SWT.NONE);
- wsdlVersionLabel.setText(CXFUIMessages.WSDL2JAVA_WSDL_VERSION_LABEL);
- return wsdlVersionLabel;
- }
-
- public static Combo createWSDLVersionCombo(Composite parent, final WSDL2JavaContext model) {
- final Combo wsdlVersionCombo = new Combo(parent, SWT.READ_ONLY);
- wsdlVersionCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_WSDL_VERSION_TOOLTIP);
- wsdlVersionCombo.add(model.getWsdlVersion());
- wsdlVersionCombo.setEnabled(false);
- wsdlVersionCombo.select(0);
- return wsdlVersionCombo;
- }
-
- public static Button createDefaultValuesButton(Composite parent, final WSDL2JavaContext model) {
- final Button useDefaultValuesButton = new Button(parent, SWT.CHECK);
- useDefaultValuesButton.setText(CXFUIMessages.WSDL2JAVA_USE_DEFAULT_VALUES);
- useDefaultValuesButton.setToolTipText(CXFUIMessages.WSDL2JAVA_DEFAULT_VALUES_TOOLTIP);
- useDefaultValuesButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- model.setUseDefaultValues(useDefaultValuesButton.getSelection());
- }
- });
- useDefaultValuesButton.setSelection(model.isUseDefaultValues());
- return useDefaultValuesButton;
- }
-
- public static Label createOutputDirectoryLabel(Composite parent) {
- Label srcDirLabel = new Label(parent, SWT.NONE);
- srcDirLabel.setText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY);
- srcDirLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP);
- return srcDirLabel;
- }
-
- public static Combo createOutputDirectoryCombo(Composite parent, final WSDL2JavaDataModel model) {
- final Combo outputDirCombo = new Combo(parent, SWT.READ_ONLY);
- outputDirCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP);
- outputDirCombo.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- String javaSourceFolder = outputDirCombo.getText();
- model.setJavaSourceFolder(javaSourceFolder);
- }
- });
-
- populateOutputDirectoryCombo(outputDirCombo, model.getProjectName());
-
- return outputDirCombo;
- }
-
- public static void populateOutputDirectoryCombo(Combo outputDirCombo, String projectName) {
- outputDirCombo.removeAll();
- try {
- IPackageFragmentRoot[] packageFragmentRoots = JDTUtils.getJavaProject(projectName)
- .getAllPackageFragmentRoots();
- for (int i = 0; i < packageFragmentRoots.length; i++) {
- IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[i];
- if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
- outputDirCombo.add(packageFragmentRoot.getResource().getFullPath().toOSString());
- }
- }
- outputDirCombo.select(0);
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
- }
-
- public static Label createPackageNameLabel(Composite parent) {
- Label packageNameLabel = new Label(parent, SWT.NONE);
- packageNameLabel.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME);
- packageNameLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_TOOLTIP);
- return packageNameLabel;
- }
-
- public static Text createPackageNameText(Composite parent, final WSDL2JavaDataModel model) {
- final Text packageNameText = new Text(parent, SWT.BORDER);
- packageNameText.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_TOOLTIP);
-
- packageNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String packageName = packageNameText.getText();
- model.getIncludedNamespaces().put(model.getTargetNamespace(), packageName);
- }
- });
-
- packageNameText.setText(model.getIncludedNamespaces().get(model.getTargetNamespace()));
-
- return packageNameText;
- }
-
- public static Button createNamespacePackageMappingButton(Composite parent) {
- final Button namespaceMappingButton = new Button(parent, SWT.CHECK);
- namespaceMappingButton.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_OPTIONAL);
- namespaceMappingButton.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP);
- return namespaceMappingButton;
- }
-
- public static TableViewerColumn createWSDLNamespaceViewerColumn(TableViewer tableViewer) {
- TableViewerColumn wsdlNamespaceViewerColumn = new TableViewerColumn(tableViewer, SWT.LEFT);
- wsdlNamespaceViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- return element.toString();
- }
- });
- TableColumn wsdlNamespaceColumn = wsdlNamespaceViewerColumn.getColumn();
- wsdlNamespaceColumn.setText(CXFUIMessages.WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER);
- wsdlNamespaceColumn.pack();
- return wsdlNamespaceViewerColumn;
- }
-
- public static TableViewerColumn createPackageNameColumn(TableViewer tableViewer, WSDL2JavaDataModel model) {
- TableViewerColumn packageNameViewerColumn = new TableViewerColumn(tableViewer, SWT.LEFT);
- packageNameViewerColumn.setLabelProvider(new PackageNameColumnLabelProvider(model));
-
- TableColumn packageNameColumn = packageNameViewerColumn.getColumn();
- packageNameColumn.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER);
- packageNameColumn.pack();
- return packageNameViewerColumn;
- }
-
- public static Label createServiceNameLabel(Composite parent) {
- Label serviceNameLabel = new Label(parent, SWT.NONE);
- serviceNameLabel.setText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME);
- serviceNameLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME_TOOLTIP);
- return serviceNameLabel;
- }
-
- public static Combo createServiceNameCombo(Composite parent, final WSDL2JavaDataModel model) {
- final Combo serviceNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- serviceNameCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME_TOOLTIP);
-
- serviceNameCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- model.setServiceName(serviceNameCombo.getText());
- }
- });
-
- populateServiceNameCombo(serviceNameCombo, model);
-
- return serviceNameCombo;
- }
-
- @SuppressWarnings("unchecked")
- public static void populateServiceNameCombo(Combo serviceNameCombo, WSDL2JavaDataModel model) {
- serviceNameCombo.removeAll();
- Definition definition = model.getWsdlDefinition();
- if (definition != null) {
- Map servicesMap = definition.getServices();
- if (servicesMap != null) {
- Set servicesEntrySet = servicesMap.entrySet();
- Iterator servicesIterator = servicesEntrySet.iterator();
- while (servicesIterator.hasNext()) {
- Map.Entry serviceEntry = (Map.Entry) servicesIterator.next();
- Service service = (Service) serviceEntry.getValue();
- QName qName = service.getQName();
- serviceNameCombo.add(qName.getLocalPart());
- }
- serviceNameCombo.deselectAll();
- }
- }
- }
-
- public static Label createBindingFilesLabel(Composite parent) {
- Label bindingFilesLabel = new Label(parent, SWT.NONE);
- bindingFilesLabel.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES);
- bindingFilesLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_BINDING_NAME_TOOLTIP);
- return bindingFilesLabel;
- }
-
- public static List createBindingFilesList(Composite parent) {
- final List bindingFilesList = new List(parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- bindingFilesList.setToolTipText(CXFUIMessages.WSDL2JAVA_BINDING_NAME_TOOLTIP);
- return bindingFilesList;
- }
-
- public static Button createAddBindingFileButton(final Composite parent, final WSDL2JavaDataModel model,
- final List bindingFilesList) {
- Button addBindingFileButton = new Button(parent, SWT.PUSH);
- addBindingFileButton.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES_ADD);
- addBindingFileButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- ResourceSelectionDialog selectionDialog = new ResourceSelectionDialog(
- parent.getShell(),
- "xml", //$NON-NLS-1$
- CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME,
- CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_TITLE);
- selectionDialog.setMessage(CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE);
- if (selectionDialog.open() == SelectionDialog.OK) {
- String result = selectionDialog.getResult()[0].toString();
- if (!model.getBindingFiles().contains(result)) {
- model.getBindingFiles().add(result);
- bindingFilesList.add(result);
- }
- }
- }
- });
- return addBindingFileButton;
- }
-
- public static Button createRemoveBindingFileButton(Composite parent, final WSDL2JavaDataModel model,
- final List bindingFilesList) {
- final Button removeBindingFileButton = new Button(parent, SWT.PUSH);
- removeBindingFileButton.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES_REMOVE);
- removeBindingFileButton.setEnabled(false);
- removeBindingFileButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- String[] selectedBindingFiles = bindingFilesList.getSelection();
- for (String bindingFile : selectedBindingFiles) {
- bindingFilesList.remove(bindingFile);
- model.getBindingFiles().remove(bindingFile);
- }
-
- if (bindingFilesList.getItemCount() == 0) {
- removeBindingFileButton.setEnabled(false);
- }
- }
- });
-
- bindingFilesList.addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent event) {
- if (bindingFilesList.getItemCount() == 0) {
- removeBindingFileButton.setEnabled(false);
- } else {
- removeBindingFileButton.setEnabled(true);
- }
- }
- });
-
- return removeBindingFileButton;
- }
-
- public static Label createPaddingLabel(Composite parent) {
- return new Label(parent, SWT.NONE);
- }
-
- public static Label createXMLCatalogLabel(Composite parent) {
- Label xmlCatalogLabel = new Label(parent, SWT.NONE);
- xmlCatalogLabel.setText(CXFUIMessages.WSDL2JAVA_XML_CATLOG);
- xmlCatalogLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_XML_CATALOG_TOOLTIP);
- return xmlCatalogLabel;
- }
-
- public static Text createXMLCatalogText(Composite parent, final WSDL2JavaDataModel model) {
- final Text xmlCatalogText = new Text(parent, SWT.BORDER);
- xmlCatalogText.setToolTipText(CXFUIMessages.WSDL2JAVA_XML_CATALOG_TOOLTIP);
- xmlCatalogText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String xmlCatalog = xmlCatalogText.getText();
- model.setCatalogFile(xmlCatalog);
- }
- });
-
- return xmlCatalogText;
- }
-
- public static Button createXMLCatalogBrowseButton(Composite parent) {
- Button xmlCatalogBrowseButton = new Button(parent, SWT.PUSH);
- xmlCatalogBrowseButton.setText(CXFUIMessages.WSDL2JAVA_XML_CATLOG_BROWSE);
- return xmlCatalogBrowseButton;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFClasspathContainerPage.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFClasspathContainerPage.java
deleted file mode 100644
index 81a877a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFClasspathContainerPage.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.wizards;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-
-public class CXFClasspathContainerPage extends WizardPage implements IClasspathContainerPage, IClasspathContainerPageExtension {
-
- private IProject project;
- private ComboViewer installationsComboViewer;
- private Link link;
- private CXFContext context;
- private CXFInstall defaultInstall;
- private String intalledVersion;
-
- public CXFClasspathContainerPage() {
- super("cxf.classpath.container.page");
- setTitle(CXFUIMessages.CXF_INSTALL_WIZARD_PAGE_TITLE);
- setDescription(CXFUIMessages.CXF_INSTALL_WIZARD_PAGE_DESCRIPTION);
- setImageDescriptor(CXFUIPlugin.imageDescriptorFromPlugin(CXFUIPlugin.PLUGIN_ID, "icons/wizban/library_wiz.png"));
- context = CXFCorePlugin.getDefault().getJava2WSContext();
- }
-
- public boolean finish() {
- return true;
- }
-
- public IClasspathEntry getSelection() {
- CXFInstall selectedInstall = getSelectedInstall();
- if (selectedInstall != null && !selectedInstall.getVersion().equals(intalledVersion)) {
- CXFCorePlugin.getDefault().setCXFRuntimeVersion(project, selectedInstall.getVersion());
-
- IClasspathAttribute jstComponentDependency =
- JavaCore.newClasspathAttribute("org.eclipse.jst.component.dependency", "/WEB-INF/lib"); //$NON-NLS-1$
- IPath path = new Path(CXFCorePlugin.CXF_CLASSPATH_CONTAINER_ID);
- path = path.append(selectedInstall.getType());
- path = path.append(selectedInstall.getVersion());
- return JavaCore.newContainerEntry(path, new IAccessRule[0],
- CXFCorePlugin.getDefault().getJava2WSContext().isExportCXFClasspathContainer()
- ? new IClasspathAttribute[]{jstComponentDependency} : new IClasspathAttribute[]{},
- true);
- }
- return null;
- }
-
- public void setSelection(IClasspathEntry containerEntry) {
- if (project != null) {
- intalledVersion = CXFCorePlugin.getDefault().getCXFRuntimeVersion(project);
- defaultInstall = context.getInstallations().get(intalledVersion);
- if (defaultInstall != null && installationsComboViewer != null) {
- installationsComboViewer.setSelection(new StructuredSelection(defaultInstall), true);
- }
- }
- }
-
- public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
-
- GridLayout gridLayout = new GridLayout(2, false);
- composite.setLayout(gridLayout);
-
- link = new Link(composite, SWT.NONE);
- link.setText(CXFUIMessages.CXF_CONFIGURE_INSTALLED_RUNTIMES_LABEL);
- link.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- int selectedIndex = installationsComboViewer.getCombo().getSelectionIndex();
- int result = PreferencesUtil.createPreferenceDialogOn(getShell(),
- "org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage", //$NON-NLS-1$
- new String[] {"org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage"}, null).open(); //$NON-NLS-1$
- if (result == Window.OK) {
- installationsComboViewer.refresh();
- installationsComboViewer.getCombo().select(selectedIndex);
- }
- }
- });
-
- GridData gridData = new GridData(SWT.END, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- link.setLayoutData(gridData);
-
- Label label = new Label(composite, SWT.NONE);
- label.setText(CXFUIMessages.CXF_PROPERTY_PAGE_RUNTIME_LABEL);
-
- installationsComboViewer = new ComboViewer(composite, SWT.BORDER | SWT.READ_ONLY);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- installationsComboViewer.getCombo().setLayoutData(gridData);
-
- installationsComboViewer.setContentProvider(new IStructuredContentProvider() {
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Collection<?>) {
- return ((Collection<?>) inputElement).toArray();
- }
- return new Object[] {};
- }
- });
-
- installationsComboViewer.setLabelProvider(new LabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof CXFInstall) {
- CXFInstall cxfInstall = (CXFInstall) element;
- return cxfInstall.getType() + " " + cxfInstall.getVersion();
- }
- return ""; //$NON-NLS-1$
- }
- });
-
- Collection<CXFInstall> installations = context.getInstallations().values();
-
- installationsComboViewer.setInput(installations);
-
- Dialog.applyDialogFont(composite);
- setControl(composite);
- setSelection(null);
- }
-
- public void initialize(IJavaProject javaProject, IClasspathEntry[] currentEntries) {
- if (javaProject != null) {
- this.project = javaProject.getProject();
- }
- }
-
- private CXFInstall getSelectedInstall() {
- StructuredSelection structuredSelection = (StructuredSelection) installationsComboViewer.getSelection();
- if (!structuredSelection.isEmpty()) {
- CXFInstall selectedInstall = (CXFInstall) structuredSelection.getFirstElement();
- return selectedInstall;
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFFacetInstallWizardPage.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFFacetInstallWizardPage.java
deleted file mode 100644
index 10d266e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFFacetInstallWizardPage.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.wizards;
-
-import java.util.Collection;
-
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
-
-public class CXFFacetInstallWizardPage extends AbstractFacetWizardPage {
-
- private CXFDataModel dataModel;
- private CXFContext cxfContext;
-
- private ComboViewer installationsComboViewer;
-
- public CXFFacetInstallWizardPage() {
- super("cxf.core.facet.install.page"); //$NON-NLS-1$
- setTitle(CXFUIMessages.CXF_FACET_INSTALL_WIZARD_PAGE_TITLE);
- setDescription(CXFUIMessages.CXF_FACET_INSTALL_WIZARD_PAGE_DESCRIPTION);
- cxfContext = CXFCorePlugin.getDefault().getJava2WSContext();
- }
-
- public void setConfig(Object config) {
- dataModel = (CXFDataModel) config;
- }
-
- @Override
- public void transferStateToConfig() {
- StructuredSelection structuredSelection = (StructuredSelection) installationsComboViewer.getSelection();
- CXFInstall selectedInstall = (CXFInstall) structuredSelection.getFirstElement();
- if (selectedInstall != null) {
- dataModel.setDefaultRuntimeVersion(selectedInstall.getVersion());
- dataModel.setDefaultRuntimeLocation(selectedInstall.getLocation());
- dataModel.setDefaultRuntimeType(selectedInstall.getType());
- }
- }
-
- public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
-
- GridLayout gridLayout = new GridLayout(2, false);
- composite.setLayout(gridLayout);
-
- Link link = new Link(composite, SWT.RIGHT);
- link.setText(CXFUIMessages.CXF_CONFIGURE_INSTALLED_RUNTIMES_LABEL);
- link.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- int selectedIndex = installationsComboViewer.getCombo().getSelectionIndex();
- int result = PreferencesUtil.createPreferenceDialogOn(getShell(),
- "org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage", //$NON-NLS-1$
- new String[] { "org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage" }, null).open(); //$NON-NLS-1$
- if (result == Window.OK) {
- installationsComboViewer.refresh();
- setDefault();
- }
- }
- });
-
- GridData gridData = new GridData(SWT.END, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- link.setLayoutData(gridData);
-
- Label label = new Label(composite, SWT.NONE);
- label.setText("CXF runtime:");
-
- installationsComboViewer = new ComboViewer(composite, SWT.BORDER | SWT.READ_ONLY);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- installationsComboViewer.getCombo().setLayoutData(gridData);
-
- installationsComboViewer.setContentProvider(new IStructuredContentProvider() {
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Collection<?>) {
- return ((Collection<?>) inputElement).toArray();
- }
- return new Object[] {};
- }
- });
-
- installationsComboViewer.setLabelProvider(new LabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof CXFInstall) {
- CXFInstall cxfInstall = (CXFInstall) element;
- return cxfInstall.getType() + " " + cxfInstall.getVersion();
- }
- return "";
- }
-
- });
-
- Collection<CXFInstall> installations = cxfContext.getInstallations().values();
- installationsComboViewer.setInput(installations);
- setDefault();
- setControl(composite);
- }
-
- private void setDefault() {
- String intalledVersion = CXFCorePlugin.getDefault().getJava2WSContext().getDefaultRuntimeVersion();
- CXFInstall defaultInstall = cxfContext.getInstallations().get(intalledVersion);
- if (defaultInstall != null) {
- installationsComboViewer.setSelection(new StructuredSelection(defaultInstall), true);
- setPageComplete(true);
- } else {
- setPageComplete(false);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFInstallWizard.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFInstallWizard.java
deleted file mode 100644
index 9541416..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFInstallWizard.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.wizards;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-
-public class CXFInstallWizard extends Wizard {
-
- private CXFInstallWizardPage cxfInstallWizardPage;
- private CXFInstall cxfInstall;
-
- public CXFInstallWizard() {
- setWindowTitle(CXFUIMessages.CXF_INSTALL_WIZARD_ADD_WINDOW_TITLE);
- }
-
- public CXFInstallWizard(CXFInstall cxfInstall) {
- this.cxfInstall = cxfInstall;
- setWindowTitle(CXFUIMessages.CXF_INSTALL_WIZARD_EDIT_WINDOW_TITLE);
- }
-
- @Override
- public void addPages() {
- if (cxfInstallWizardPage == null) {
- cxfInstallWizardPage = new CXFInstallWizardPage();
- if (cxfInstall != null) {
- cxfInstallWizardPage.setCXFInstall(cxfInstall);
- }
- }
- addPage(cxfInstallWizardPage);
- }
-
- @Override
- public boolean performFinish() {
- return cxfInstallWizardPage.finish();
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFInstallWizardPage.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFInstallWizardPage.java
deleted file mode 100644
index 3c78ddd..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/wizards/CXFInstallWizardPage.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.wizards;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.ws.internal.cxf.core.CXFClasspathContainer;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.CXFPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.osgi.framework.Version;
-
-public class CXFInstallWizardPage extends WizardPage {
- private IStatus CXF_LOCATION_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, null);
- private IStatus CXF_TYPE_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, null);
- private IStatus CXF_VERSION_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, null);
- private IStatus OK_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private Pattern digitPattern = Pattern.compile("\\d"); //$NON-NLS-1$
-
- private Button browseButton;
- private Text cxfHomeDirText;
- private Text cxfTypeText;
- private Text cxfVersionText;
-
- String cxfRuntimeVersion = ""; //$NON-NLS-1$
- String cxfRuntimeLocation = ""; //$NON-NLS-1$
- String cxfRuntimeType = ""; //$NON-NLS-1$
-
- private CXFInstall cxfInstall;
-
- protected CXFInstallWizardPage() {
- super("cxf.intall.wizard.page"); //$NON-NLS-1$
- setTitle(CXFUIMessages.CXF_INSTALL_WIZARD_PAGE_TITLE);
- setDescription(CXFUIMessages.CXF_INSTALL_WIZARD_PAGE_DESCRIPTION);
- setImageDescriptor(CXFUIPlugin.imageDescriptorFromPlugin(CXFUIPlugin.PLUGIN_ID, "icons/wizban/library_wiz.png"));
- }
-
- public void createControl(Composite parent) {
- final Composite composite = new Composite(parent, SWT.NONE);
-
- GridLayout gridLayout = new GridLayout(3, false);
- composite.setLayout(gridLayout);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gridData);
-
- Label label = new Label(composite, SWT.NONE);
- label.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL);
-
- cxfHomeDirText = new Text(composite, SWT.BORDER);
-
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- cxfHomeDirText.setLayoutData(gridData);
-
- cxfHomeDirText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- updateLocationStatus();
- }
- });
-
- browseButton = new Button(composite, SWT.NONE);
- browseButton.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL);
-
- browseButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- DirectoryDialog fileDialog = new DirectoryDialog(composite.getShell());
- String fileName = fileDialog.open();
- if (fileName != null) {
- cxfHomeDirText.setText(fileName);
- }
- }
- });
-
- //CXF Version
- Label cxfVersionLabel = new Label(composite, SWT.NONE);
- cxfVersionLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSION_LABEL);
-
- cxfVersionText = new Text(composite, SWT.BORDER | SWT.READ_ONLY);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- cxfVersionText.setLayoutData(gridData);
- cxfVersionText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- updateVersionStatus();
- }
- });
-
- //Blank label
- new Label(composite, SWT.NONE);
-
- //CXF Type
- Label cxfTypeLabel = new Label(composite, SWT.NONE);
- cxfTypeLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_CXF_TYPE_LABEL);
-
- cxfTypeText = new Text(composite, SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- cxfTypeText.setLayoutData(gridData);
- cxfTypeText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- updateTypeStatus();
- }
- });
-
- if (cxfInstall != null) {
- cxfHomeDirText.setText(cxfInstall.getLocation());
- cxfVersionText.setText(cxfInstall.getVersion());
- cxfTypeText.setText(cxfInstall.getType());
- }
-
- setControl(composite);
- Dialog.applyDialogFont(composite);
- }
-
- public void setCXFInstall(CXFInstall cxfInstall) {
- this.cxfInstall = cxfInstall;
- }
-
- private void updateLocationStatus() {
- CXF_LOCATION_STATUS = checkRuntimeExist(cxfHomeDirText.getText());
- applyStatusToPage(findMostSevere());
- }
-
- private void updateTypeStatus() {
- CXF_TYPE_STATUS = validateTypeName(cxfTypeText.getText());
- applyStatusToPage(findMostSevere());
- }
-
- private void updateVersionStatus() {
- CXF_VERSION_STATUS = validateVersion(cxfVersionText.getText());
- applyStatusToPage(findMostSevere());
- }
-
- private void applyStatusToPage(IStatus status) {
- String message = status.getMessage();
- if (status.getSeverity() > IStatus.OK) {
- setErrorMessage(message);
- setPageComplete(false);
-
- } else {
- setMessage(getDescription());
- setErrorMessage(null);
- setPageComplete(true);
- }
- }
-
- private IStatus findMostSevere() {
- if (CXF_TYPE_STATUS.getSeverity() > CXF_LOCATION_STATUS.getSeverity()) {
- return CXF_TYPE_STATUS;
- }
- if (CXF_VERSION_STATUS.getSeverity() > CXF_LOCATION_STATUS.getSeverity()) {
- return CXF_VERSION_STATUS;
- }
- if (CXF_TYPE_STATUS.getSeverity() == CXF_LOCATION_STATUS.getSeverity()) {
- return CXF_LOCATION_STATUS;
- }
- if (CXF_VERSION_STATUS.getSeverity() == CXF_LOCATION_STATUS.getSeverity()) {
- return CXF_LOCATION_STATUS;
- }
-
- return CXF_LOCATION_STATUS;
- }
-
- private IStatus checkRuntimeExist(String path) {
- File cxfHomeDir = new File(path);
- if (cxfHomeDirText.getText().trim().equals("")) { //$NON-NLS-1$
- CXF_LOCATION_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
- CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
- }
- String cxfLibPath = cxfHomeDir + System.getProperty("file.separator") + "lib"; //$NON-NLS-1$ //$NON-NLS-2$
- if (cxfHomeDir.isDirectory()) {
- File cxfLibFolder = new File(cxfLibPath);
- if (cxfLibFolder.isDirectory()) {
- String[] cxfJarFiles = getCXFJarFiles(cxfLibFolder);
- if (cxfJarFiles != null && cxfJarFiles.length > 0) {
- IStatus toolVersionStatus = getToolVersion(cxfLibPath);
- processToolVersion(toolVersionStatus);
- return CXF_LOCATION_STATUS = OK_STATUS;
- }
- }
- }
- cxfTypeText.setText("");
- cxfVersionText.setText("");
- CXF_LOCATION_STATUS = new Status(Status.ERROR, CXFUIPlugin.PLUGIN_ID,
- CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
- return CXF_LOCATION_STATUS;
- }
-
- private IStatus validateTypeName(String typeName) {
- if (typeName.trim().length() == 0) {
- CXF_TYPE_STATUS = new Status(Status.ERROR, CXFUIPlugin.PLUGIN_ID, CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_ENTER_TYPE_NAME);
- } else {
- CXF_TYPE_STATUS = OK_STATUS;
- }
- if (!typeName.matches("[a-zA-Z0-9_\\-\\s]+")) {
- CXF_TYPE_STATUS = new Status(Status.ERROR, CXFUIPlugin.PLUGIN_ID,
- CXFUIMessages.bind(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_INVALID_TYPE_NAME, typeName));
- } else {
- CXF_TYPE_STATUS = OK_STATUS;
- }
- return CXF_TYPE_STATUS;
- }
-
- private IStatus validateVersion(String version) {
- if (CXFCorePlugin.getDefault().getJava2WSContext().getInstallations().containsKey(version)
- && cxfInstall != null && !cxfInstall.getVersion().equals(version)) {
- CXF_VERSION_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, "Version already installed");
- } else {
- CXF_VERSION_STATUS = OK_STATUS;
- }
- return CXF_VERSION_STATUS;
- }
-
- private String[] getCXFJarFiles(File directory) {
- String[] cxfJarFiles = directory.list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- if (name.startsWith("cxf") && name.endsWith(".jar") //$NON-NLS-1$ //$NON-NLS-2$
- && digitPattern.matcher(name).find()) {
- return true;
- }
- return false;
- }
- });
- return cxfJarFiles;
- }
-
- private IStatus getToolVersion(String cxLibFolderPath) {
- File cxfLibFolder = new File(cxLibFolderPath);
- List<String> cxfLib = new ArrayList<String>();
- String[] jarFiles = cxfLibFolder.list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- if (name.endsWith(".jar")) { //$NON-NLS-1$
- return true;
- }
- return false;
- }
- });
-
- for (String jarFile : jarFiles) {
- cxfLib.add(cxLibFolderPath + System.getProperty("file.separator") + jarFile); //$NON-NLS-1$
- }
-
- IStatus toolVersionStatus = LaunchUtils.launch(cxfLib.toArray(new String[cxfLib.size()]),
- "org.apache.cxf.tools.wsdlto.WSDLToJava", new String[] { "-v" }); //$NON-NLS-1$ //$NON-NLS-2$
- return toolVersionStatus;
- }
-
- private void processToolVersion(IStatus toolVersionStatus) {
- if (toolVersionStatus.getSeverity() == IStatus.INFO) {
- String cxfToolVersion = toolVersionStatus.getMessage();
-
- cxfToolVersion = cxfToolVersion.substring(cxfToolVersion.indexOf("-") + 1, //$NON-NLS-1$
- cxfToolVersion.length()).trim();
-
- Matcher matcher = digitPattern.matcher(cxfToolVersion);
- if (matcher.find()) {
- int start = matcher.start();
- int end = matcher.end();
- while (matcher.find()) {
- end = matcher.end();
- }
- cxfRuntimeType = cxfToolVersion.substring(0, start).trim();
- cxfRuntimeVersion = cxfToolVersion.substring(start, end);
- }
-
- cxfVersionText.setText(cxfRuntimeVersion);
- cxfTypeText.setText(cxfRuntimeType);
- CXFCorePlugin.getDefault().setCurrentRuntimeVersion(new Version(cxfRuntimeVersion));
- }
- }
-
- public boolean finish() {
- CXFPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
- Map<String, CXFInstall> installs = context.getInstallations();
- CXFInstall install = CXFFactory.eINSTANCE.createCXFInstall();
- install.setVersion(cxfVersionText.getText().trim());
- install.setLocation(cxfHomeDirText.getText().trim());
- install.setType(cxfTypeText.getText().trim());
- installs.put(cxfRuntimeVersion, install);
- context.setInstallations(installs);
- if (isUpdateRequired(install)) {
- updateProjects(install);
- }
- return true;
- }
-
- public boolean isUpdateRequired(CXFInstall install) {
- if (cxfInstall == null) {
- return false;
- }
- if (!cxfInstall.getLocation().equals(install.getLocation())
- || !cxfInstall.getType().equals(install.getType())) {
- return true;
- }
- return false;
- }
-
- public void updateProjects(CXFInstall install) {
- try {
- Set<IFacetedProject> cxfProjects = ProjectFacetsManager.getFacetedProjects(ProjectFacetsManager.getProjectFacet("cxf.core"));
- Iterator<IFacetedProject> projIter = cxfProjects.iterator();
- while (projIter.hasNext()) {
- IFacetedProject cxfProject = projIter.next();
- String installedVersion = CXFCorePlugin.getDefault().getCXFRuntimeVersion(cxfProject.getProject());
- if (installedVersion.equals(install.getVersion())) {
- ClasspathContainerInitializer classpathContainerInitializer = JavaCore.getClasspathContainerInitializer(
- CXFCorePlugin.CXF_CLASSPATH_CONTAINER_ID);
- if (classpathContainerInitializer != null) {
- IPath containerPath = new Path(CXFCorePlugin.CXF_CLASSPATH_CONTAINER_ID);
- IJavaProject javaProject = JavaCore.create(cxfProject.getProject());
- CXFClasspathContainer cxfClasspathContainer = new CXFClasspathContainer(containerPath, javaProject);
- classpathContainerInitializer.requestClasspathContainerUpdate(containerPath, javaProject,
- cxfClasspathContainer);
- }
- }
- }
- } catch (CoreException ce) {
- CXFUIPlugin.log(ce.getStatus());
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/.classpath b/bundles/org.eclipse.jst.ws.jaxb.core/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/.project b/bundles/org.eclipse.jst.ws.jaxb.core/.project
deleted file mode 100644
index 275d338..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxb.core</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/bundles/org.eclipse.jst.ws.jaxb.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxb.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83e002a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Feb 02 11:50:42 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxb.core/META-INF/MANIFEST.MF
deleted file mode 100644
index b908a21..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxb.core;singleton:=true
-Bundle-Vendor: %pluginProvider
-Bundle-Version: 0.1.0.qualifier
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Eclipse-RegisterBuddy: org.eclipse.jst.ws.annotations.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.eclipse.jst.ws.internal.jaxb.core.JAXBCorePlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
-Export-Package: org.eclipse.jst.ws.internal.jaxb.core
-Import-Package: javax.xml.bind.annotation;version="[2.1.0,2.2.0)",
- javax.xml.bind.annotation.adapters;version="[2.1.0,2.2.0)"
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/about.html b/bundles/org.eclipse.jst.ws.jaxb.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</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
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/about.ini b/bundles/org.eclipse.jst.ws.jaxb.core/about.ini
deleted file mode 100644
index e3b93e6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/about.ini
+++ /dev/null
@@ -1,12 +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 feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/about.mappings b/bundles/org.eclipse.jst.ws.jaxb.core/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/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/bundles/org.eclipse.jst.ws.jaxb.core/about.properties b/bundles/org.eclipse.jst.ws.jaxb.core/about.properties
deleted file mode 100644
index cf8469f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - 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=JAXB Tools (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Shane Clarke and others 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/build.properties b/bundles/org.eclipse.jst.ws.jaxb.core/build.properties
deleted file mode 100644
index 8b9d613..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html,\
- about.properties,\
- about.ini,\
- about.mappings,\
- icons/
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.jst.ws.jaxb.core/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.properties b/bundles/org.eclipse.jst.ws.jaxb.core/plugin.properties
deleted file mode 100644
index f759216..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Progress Software
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-#properties file for JAXB Core
-pluginName=JAXB Tools Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-JAXB_CATEGORY_NAME=JAXB
-
-XML_SCHEMA_TYPE_RULES=Validation rules governing the use of @XmlSchemaType
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.xml b/bundles/org.eclipse.jst.ws.jaxb.core/plugin.xml
deleted file mode 100644
index 3120700..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.jst.ws.annotations.core.annotationCategory">
- <category
- id="jaxb.category"
- name="%JAXB_CATEGORY_NAME">
- </category>
- </extension>
-
- <extension point="org.eclipse.jst.ws.annotations.core.annotationDefinition">
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAccessorOrder"
- name="XmlAccessorOrder"/>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAccessorType"
- name="XmlAccessorType"/>
-
- <!-- TODO Reinstate when XmlAdapter issue is solved
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.adapters.XmlAdapter"
- name="XmlAdapter">
- </annotation>
- -->
-
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAnyAttribute"
- name="XmlAnyAttribute">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAnyElement"
- name="XmlAnyElement">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAttachmentRef"
- name="XmlAttachmentRef">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAttribute"
- name="XmlAttribute">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElement"
- name="XmlElement">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElementDecl"
- name="XmlElementDecl">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElementRef"
- name="XmlElementRef">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElementRefs"
- name="XmlElementRefs">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElementWrapper"
- name="XmlElementWrapper">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElements"
- name="XmlElements">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlEnum"
- name="XmlEnum">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlEnumValue"
- name="XmlEnumValue">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlID"
- name="XmlID">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlIDREF"
- name="XmlIDREF">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlInlineBinaryData"
- name="XmlInlineBinaryData">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter"
- name="XmlJavaTypeAdapter">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters"
- name="XmlJavaTypeAdapters">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlList"
- name="XmlList">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlMimeType"
- name="XmlMimeType">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlMixed"
- name="XmlMixed">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlNs"
- name="XmlNs">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlRegistry"
- name="XmlRegistry">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlRootElement"
- name="XmlRootElement">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlSchema"
- name="XmlSchema">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlSchemaType"
- name="XmlSchemaType">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlSchemaTypes"
- name="XmlSchemaTypes">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlSeeAlso"
- name="XmlSeeAlso">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlTransient"
- name="XmlTransient">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlType"
- name="XmlType">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlValue"
- name="XmlValue">
- </annotation>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.java b/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.java
deleted file mode 100644
index 44f8819..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxb.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JAXBCoreMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.jaxb.core.JAXBCoreMessages"; //$NON-NLS-1$
-
- public static String TYPE_NAME_DIFFERENT_CASE_EXISTS;
- public static String TYPE_WITH_NAME_ALREADY_EXISTS;
-
- public static String XML_SCHEMA_TYPE_MUST_HAVE_DEFAULT_ON_FIELD_OR_METHOD;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, JAXBCoreMessages.class);
- }
-
- private JAXBCoreMessages() {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.properties b/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.properties
deleted file mode 100644
index 7081bab..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Progress Software Inc
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-#JDTUtils
-TYPE_NAME_DIFFERENT_CASE_EXISTS=A Type with the same name but different case already exists
-TYPE_WITH_NAME_ALREADY_EXISTS=A compilation unit named ''{0}'' already exists in package ''{1}''
-XML_SCHEMA_TYPE_MUST_HAVE_DEFAULT_ON_FIELD_OR_METHOD=If @XmlSchemaType is used on a field or a method, then the value of type() must be DEFAULT.class (JAXB 2.1, 8.6.4.2)
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCorePlugin.java b/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCorePlugin.java
deleted file mode 100644
index 664db78..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCorePlugin.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxb.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-public class JAXBCorePlugin extends Plugin {
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxb.core"; //$NON-NLS-1$
-
- // The shared instance
- private static JAXBCorePlugin plugin;
-
- public static JAXBCorePlugin getDefault() {
- return plugin;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- public static void logMessage(int severity, String message) {
- JAXBCorePlugin.log(new Status(severity, JAXBCorePlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- JAXBCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- JAXBCorePlugin.log(new Status(IStatus.ERROR, JAXBCorePlugin.PLUGIN_ID, exception
- .getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.classpath b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.project b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.project
deleted file mode 100755
index 9784ac9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index c0bb2b4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Jun 23 10:38:22 EEST 2009
-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.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index 5aa623d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.dom.ui;singleton:=true
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi$Implementation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.ws.jaxws.dom.ui,
- org.eclipse.jst.ws.jaxws.dom.ui.internal.impl;x-friends:="org.eclipse.jst.ws.jaxws.dom.ui.tests",
- org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jst.ws.jaxws.dom.runtime;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.jaxws.utils,
- org.eclipse.jface
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/about.html b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</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
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/build.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/build.properties
deleted file mode 100755
index 2d184ee..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-bin.includes = .,\
- icons/,\
- META-INF/,\
- plugin.xml,\
- plugin.properties,\
- about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI.gif
deleted file mode 100755
index 21325ca..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI_Group.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI_Group.gif
deleted file mode 100755
index 9afcc01..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI_Group.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Method.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Method.gif
deleted file mode 100755
index 5818a30..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Method.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_In.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_In.gif
deleted file mode 100755
index fe6b349..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_In.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_Out.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_Out.gif
deleted file mode 100755
index bd0918c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_Out.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service.gif
deleted file mode 100755
index 5216b3f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Group.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Group.gif
deleted file mode 100755
index 8b4814c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Group.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Item_Provider.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Item_Provider.gif
deleted file mode 100755
index 8fb844f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Item_Provider.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/error_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/error_obj.gif
deleted file mode 100755
index 0bc6068..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/error_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIDOM_webServiceProjects_IWebServiceProject.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIDOM_webServiceProjects_IWebServiceProject.gif
deleted file mode 100755
index 4c76674..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIDOM_webServiceProjects_IWebServiceProject.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIServiceEndpointInterface_webMethods_IWebMethod.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIServiceEndpointInterface_webMethods_IWebMethod.gif
deleted file mode 100755
index 95f5a8c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIServiceEndpointInterface_webMethods_IWebMethod.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebMethod_parameters_IWebParam.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebMethod_parameters_IWebParam.gif
deleted file mode 100755
index 03d63cb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebMethod_parameters_IWebParam.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_serviceEndpointInterfaces_IServiceEndpointInterface.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_serviceEndpointInterfaces_IServiceEndpointInterface.gif
deleted file mode 100755
index 361b182..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_serviceEndpointInterfaces_IServiceEndpointInterface.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_webServices_IWebService.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_webServices_IWebService.gif
deleted file mode 100755
index 9120d10..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_webServices_IWebService.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IDOM.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IDOM.gif
deleted file mode 100755
index 420eee1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IDOM.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IJavaWebServiceElement.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IJavaWebServiceElement.gif
deleted file mode 100755
index ea58a65..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IJavaWebServiceElement.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IServiceEndpointInterface.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IServiceEndpointInterface.gif
deleted file mode 100755
index 33a997a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IServiceEndpointInterface.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebMethod.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebMethod.gif
deleted file mode 100755
index a17dc7d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebMethod.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebParam.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebParam.gif
deleted file mode 100755
index 8a5c70c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebParam.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebService.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebService.gif
deleted file mode 100755
index 53500da..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebService.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebServiceProject.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebServiceProject.gif
deleted file mode 100755
index 498364f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebServiceProject.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebType.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebType.gif
deleted file mode 100755
index c00aedf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebType.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/warning_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/warning_obj.gif
deleted file mode 100755
index 2b2e50f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/warning_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.properties
deleted file mode 100755
index caa3b76..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.properties
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-# ====================================================================
-# To code developer:
-# Do NOT change the properties between this line and the
-# "%%% END OF TRANSLATED PROPERTIES %%%" line.
-# Make a new property name, append to the end of the file and change
-# the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-Bundle-Name.0=JAX-WS DOM UI Plug-in (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_IDOM_type = IDOM
-_UI_IJavaWebServiceElement_type = Java Web Service Element
-_UI_IServiceEndpointInterface_type = Service Endpoint Interface
-_UI_IWebService_type = Web Service
-_UI_IWebServiceProject_type = Web Service Project
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_IDOM_webServiceProjects_feature = Web Service Projects
-_UI_IJavaWebServiceElement_javaImplementation_feature = Java Implementation
-_UI_IServiceEndpointInterface_name_feature = Name
-_UI_IServiceEndpointInterface_implicit_feature = Implicit
-_UI_IServiceEndpointInterface_implementingWebServices_feature = Implementing Web Services
-_UI_IServiceEndpointInterface_targetNamespace_feature = Target Namespace
-_UI_IServiceEndpointInterface_soapBinding = SOAP Binding
-_UI_IWebService_name_feature = Name
-_UI_IWebService_serviceEndpoint_feature = Service Endpoint
-_UI_IWebService_targetNamespace_feature = Target Namespace
-_UI_IWebService_portName_feature = Port Name
-_UI_IWebService_wsdlLocation_feature = WSDL Location
-_UI_IWebServiceProject_webServices_feature = Web Services
-_UI_IWebServiceProject_serviceEndpointInterfaces_feature = Service Endpoint Interfaces
-_UI_IWebServiceProject_name_feature = Name
-_UI_Unknown_feature = Unspecified
-
-_UI_WebServiceAnnotationCategory = General (WebService annotation)
-_UI_WebMethodAnnotationCategory = General (WebMethod annotation)
-_UI_WebParamAnnotationCategory = General (WebParam annotation)
-
-_UI_IJavaWebServiceElement_implementation_feature = Java representation
-_UI_IWebMethod_type = Web Method
-_UI_IWebParam_type = Web Param
-_UI_IWebType_type = Web Type
-_UI_IJavaWebServiceElement_name_feature = Name
-_UI_IWebMethod_excluded_feature = Excluded
-_UI_IWebParam_kind_feature = Mode
-_UI_IServiceEndpointInterface_webMethods_feature = Web Methods
-_UI_IWebMethod_parameters_feature = Parameters
-_UI_IWebParam_typeName_feature = Type Name
-_UI_IWebParam_partName_feature = Part Name
-_UI_IWebParam_targetNamespace_feature = Target Namespace
-_UI_IWebParam_header_feature = Header
-_UI_IServiceEndpointInterface_soapBindingStyle_feature = Style
-_UI_IServiceEndpointInterface_soapBindingUse_feature = Use
-_UI_IServiceEndpointInterface_soapBindingParameterStyle_feature = Parameter Style
-_UI_IWebMethod_soapBindingStyle_feature = Style
-_UI_IWebMethod_soapBindingUse_feature = Use
-_UI_IWebMethod_soapBindingParameterStyle_feature = Parameter Style
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.xml
deleted file mode 100755
index f94d68f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2009 by SAP AG, Walldorf.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- SAP AG - initial API and implementation
- -->
-
-<plugin>
-
- <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <factory
- uri="http:///org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore"
- class="org.eclipse.jst.ws.jaxws.dom.ui.DomItemProviderAdapterFactory"
- supportedTypes=
- "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
- org.eclipse.emf.edit.provider.IStructuredItemContentProvider
- org.eclipse.emf.edit.provider.ITreeItemContentProvider
- org.eclipse.emf.edit.provider.IItemLabelProvider
- org.eclipse.emf.edit.provider.IItemPropertySource"/>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/DomItemProviderAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/DomItemProviderAdapterFactory.java
deleted file mode 100755
index b923563..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/DomItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.DomAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DomItemProviderAdapterFactory extends DomAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
- /**
- * This constructs an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomItemProviderAdapterFactory() {
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IDOMItemProvider idomItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIDOMAdapter() {
- if (idomItemProvider == null) {
- idomItemProvider = new IDOMItemProvider(this);
- }
-
- return idomItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaWebServiceElementItemProvider iJavaWebServiceElementItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIJavaWebServiceElementAdapter() {
- if (iJavaWebServiceElementItemProvider == null) {
- iJavaWebServiceElementItemProvider = new IJavaWebServiceElementItemProvider(this);
- }
-
- return iJavaWebServiceElementItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IServiceEndpointInterfaceItemProvider iServiceEndpointInterfaceItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIServiceEndpointInterfaceAdapter() {
- if (iServiceEndpointInterfaceItemProvider == null) {
- iServiceEndpointInterfaceItemProvider = new IServiceEndpointInterfaceItemProvider(this);
- }
-
- return iServiceEndpointInterfaceItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebMethodItemProvider iWebMethodItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebMethodAdapter() {
- if (iWebMethodItemProvider == null) {
- iWebMethodItemProvider = new IWebMethodItemProvider(this);
- }
-
- return iWebMethodItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebParamItemProvider iWebParamItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebParamAdapter() {
- if (iWebParamItemProvider == null) {
- iWebParamItemProvider = new IWebParamItemProvider(this);
- }
-
- return iWebParamItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebServiceItemProvider iWebServiceItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebServiceAdapter() {
- if (iWebServiceItemProvider == null) {
- iWebServiceItemProvider = new IWebServiceItemProvider(this);
- }
-
- return iWebServiceItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebServiceProjectItemProvider iWebServiceProjectItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebServiceProjectAdapter() {
- if (iWebServiceProjectItemProvider == null) {
- iWebServiceProjectItemProvider = new IWebServiceProjectItemProvider(this);
- }
-
- return iWebServiceProjectItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebTypeItemProvider iWebTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebTypeAdapter() {
- if (iWebTypeItemProvider == null) {
- iWebTypeItemProvider = new IWebTypeItemProvider(this);
- }
-
- return iWebTypeItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class<?>)type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This disposes all of the item providers created by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void dispose() {
- if (idomItemProvider != null) idomItemProvider.dispose();
- if (iJavaWebServiceElementItemProvider != null) iJavaWebServiceElementItemProvider.dispose();
- if (iServiceEndpointInterfaceItemProvider != null) iServiceEndpointInterfaceItemProvider.dispose();
- if (iWebMethodItemProvider != null) iWebMethodItemProvider.dispose();
- if (iWebParamItemProvider != null) iWebParamItemProvider.dispose();
- if (iWebServiceItemProvider != null) iWebServiceItemProvider.dispose();
- if (iWebServiceProjectItemProvider != null) iWebServiceProjectItemProvider.dispose();
- if (iWebTypeItemProvider != null) iWebTypeItemProvider.dispose();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMItemProvider.java
deleted file mode 100755
index 00e1cd4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMItemProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IDOMItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IDOMItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(DomPackage.Literals.IDOM__WEB_SERVICE_PROJECTS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns IDOM.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IDOM")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- return getString("_UI_IDOM_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IDOM.class)) {
- case DomPackage.IDOM__WEB_SERVICE_PROJECTS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.IDOM__WEB_SERVICE_PROJECTS,
- DomFactory.eINSTANCE.createIWebServiceProject()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMPropertyValue.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMPropertyValue.java
deleted file mode 100755
index 7862b01..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMPropertyValue.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-
-/**
- * Interface representing property value. This interface is used to identify property values for WS DOM objects.
- *
- * @author Georgi Vachkov
- */
-public interface IDOMPropertyValue extends IItemPropertySource
-{
- public Object getEditableValue();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IJavaWebServiceElementItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IJavaWebServiceElementItemProvider.java
deleted file mode 100755
index 84dbb8f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IJavaWebServiceElementItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IJavaWebServiceElementItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaWebServiceElementItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addImplementationPropertyDescriptor(object);
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Implementation feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addImplementationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaWebServiceElement_implementation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaWebServiceElement_implementation_feature", "_UI_IJavaWebServiceElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaWebServiceElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaWebServiceElement_name_feature", "_UI_IJavaWebServiceElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This method defines at which category the name should go to. Extender of
- * this class should override it if wants the name to be separated in different
- * than default category.
- *
- * @return the default implementation returns <code>null</code>
- */
- public String getNameCategory() {
- return null;
- }
-
- /**
- * This returns IJavaWebServiceElement.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IJavaWebServiceElement")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((IJavaWebServiceElement)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IJavaWebServiceElement_type") : //$NON-NLS-1$
- getString("_UI_IJavaWebServiceElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IJavaWebServiceElement.class)) {
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION:
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IServiceEndpointInterfaceItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IServiceEndpointInterfaceItemProvider.java
deleted file mode 100755
index f88bc41..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IServiceEndpointInterfaceItemProvider.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IServiceEndpointInterfaceItemProvider
- extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IServiceEndpointInterfaceItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- itemPropertyDescriptors = null;
-
- super.getPropertyDescriptors(object);
-
- addImplicitPropertyDescriptor(object);
- addImplementingWebServicesPropertyDescriptor(object);
- addTargetNamespacePropertyDescriptor(object);
- addSoapBindingStylePropertyDescriptor(object);
- addSoapBindingUsePropertyDescriptor(object);
- addSoapBindingParameterStylePropertyDescriptor(object);
-
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Implicit feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addImplicitPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_implicit_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_implicit_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Implementing Web Services feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addImplementingWebServicesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_implementingWebServices_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_implementingWebServices_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES,
- false,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Target Namespace feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addTargetNamespacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_targetNamespace_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_targetNamespace_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Style feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingStylePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_soapBindingStyle_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_soapBindingStyle_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Use feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingUsePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_soapBindingUse_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_soapBindingUse_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Parameter Style feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingParameterStylePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_soapBindingParameterStyle_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_soapBindingParameterStyle_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns IServiceEndpointInterface.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, Images.INSTANCE.getImage(Images.IMG_SEI));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public String getText(Object object) {
- String label = ((IServiceEndpointInterface)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IServiceEndpointInterface_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IServiceEndpointInterface.class)) {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS,
- DomFactory.eINSTANCE.createIWebMethod()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
- @Override
- public String getNameCategory()
- {
- return getString("_UI_WebServiceAnnotationCategory"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebMethodItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebMethodItemProvider.java
deleted file mode 100755
index 7800540..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebMethodItemProvider.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebMethodItemProvider extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebMethodItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors != null) {
- return itemPropertyDescriptors;
- }
-
- super.getPropertyDescriptors(object);
-
- addExcludedPropertyDescriptor(object);
- addSoapBindingStylePropertyDescriptor(object);
- addSoapBindingUsePropertyDescriptor(object);
- addSoapBindingParameterStylePropertyDescriptor(object);
-
- return itemPropertyDescriptors;
- }
-
- @Override
- protected void addImplementationPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add(
- new ItemPropertyDescriptor(
- ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaWebServiceElement_implementation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaWebServiceElement_implementation_feature", "_UI_IJavaWebServiceElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null)
- {
-
- @Override
- protected Object getValue(EObject object, EStructuralFeature feature)
- {
- String returnString = ""; //$NON-NLS-1$
- String parameters = ""; //$NON-NLS-1$
- IWebMethod webMethod = (IWebMethod)getTarget();
-
- for(IWebParam webParam : webMethod.getParameters())
- {
- if(webParam.getName().equals("return")) //$NON-NLS-1$
- {
- returnString = getTypeName(webParam.getTypeName()) + " "; //$NON-NLS-1$
- }
- else
- {
- parameters = parameters + getTypeName(webParam.getTypeName()) + ", "; //$NON-NLS-1$
- }
- }
-
- if (parameters.length() > 0) {
- parameters = parameters.substring(0, parameters.lastIndexOf(','));
- }
-
- String methodName = webMethod.getImplementation();
- int pos = methodName.indexOf('(');
- if (pos > -1) {
- methodName = methodName.substring(0, pos);
- }
-
- return returnString + methodName + '(' + parameters + ')';
- }
-
- protected String getTypeName(String typeName)
- {
- return typeName.substring(typeName.lastIndexOf('.') + 1);
- }
- });
- }
-
- /**
- * This adds a property descriptor for the Excluded feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addExcludedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebMethod_excluded_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebMethod_excluded_feature", "_UI_IWebMethod_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_METHOD__EXCLUDED,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Style feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingStylePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebMethod_soapBindingStyle_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebMethod_soapBindingStyle_feature", "_UI_IWebMethod_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_METHOD__SOAP_BINDING_STYLE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Use feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingUsePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebMethod_soapBindingUse_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebMethod_soapBindingUse_feature", "_UI_IWebMethod_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_METHOD__SOAP_BINDING_USE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Parameter Style feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingParameterStylePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebMethod_soapBindingParameterStyle_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebMethod_soapBindingParameterStyle_feature", "_UI_IWebMethod_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(DomPackage.Literals.IWEB_METHOD__PARAMETERS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns Web_Method.gif.
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, Images.INSTANCE.getImage(Images.IMG_WEB_METHOD));
- }
-
- /**
- * This returns the label text for the adapted class.
- */
- @Override
- public String getText(Object object) {
- String label = ((IWebMethod)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IWebMethod_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IWebMethod.class)) {
- case DomPackage.IWEB_METHOD__EXCLUDED:
- case DomPackage.IWEB_METHOD__SOAP_BINDING_STYLE:
- case DomPackage.IWEB_METHOD__SOAP_BINDING_USE:
- case DomPackage.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DomPackage.IWEB_METHOD__PARAMETERS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.IWEB_METHOD__PARAMETERS,
- DomFactory.eINSTANCE.createIWebParam()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
- @Override
- public String getNameCategory()
- {
- return getString("_UI_WebMethodAnnotationCategory"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebParamItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebParamItemProvider.java
deleted file mode 100755
index b075bad..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebParamItemProvider.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state.PropertyStateAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebParamItemProvider
- extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors != null) {
- return itemPropertyDescriptors;
- }
-
- super.getPropertyDescriptors(object);
-
- addKindPropertyDescriptor(object);
- addTypeNamePropertyDescriptor(object);
- addPartNamePropertyDescriptor(object);
- addTargetNamespacePropertyDescriptor(object);
- addHeaderPropertyDescriptor(object);
-
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Kind feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addKindPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_kind_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_kind_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__KIND,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addTypeNamePropertyDescriptorOld(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_typeName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_typeName_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__TYPE_NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- protected void addTypeNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new ItemPropertyDescriptor(
- ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_typeName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_typeName_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__TYPE_NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null)
- {
- @Override
- protected Object getValue(EObject object, EStructuralFeature feature)
- {
- String typeName = null;
-
- final Object typeSignature = super.getValue(object, feature);
- if (typeSignature != null)
- {
- typeName = Signature.toString(typeSignature.toString());
- }
-
- return typeName;
- }
- });
- }
-
- /**
- * This adds a property descriptor for the Part Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addPartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_partName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_partName_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__PART_NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Target Namespace feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addTargetNamespacePropertyDescriptor(Object object) {
- final IPropertyState state = (IPropertyState)PropertyStateAdapterFactory.INSTANCE.adapt(object, IPropertyState.class);
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_targetNamespace_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_targetNamespace_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__TARGET_NAMESPACE,
- (state==null) ? false : state.isChangeable(DomPackage.Literals.IWEB_PARAM__TARGET_NAMESPACE),
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Header feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addHeaderPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_header_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_header_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__HEADER,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This returns Web_Param.gif.
- */
- @Override
- public Object getImage(Object object)
- {
- String imageName = Images.IMG_WEB_PARAM_IN;
-
- if ((object instanceof IWebParam) && ((IWebParam) object).getImplementation().equals("return")) //$NON-NLS-1$
- {
- imageName = Images.IMG_WEB_PARAM_OUT;
- }
-
- return overlayImage(object, Images.INSTANCE.getImage(imageName));
- }
-
- /**
- * This returns the label text for the adapted class.
- */
- @Override
- public String getText(Object object)
- {
- return ((IWebParam)object).getName();
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IWebParam.class)) {
- case DomPackage.IWEB_PARAM__KIND:
- case DomPackage.IWEB_PARAM__TYPE_NAME:
- case DomPackage.IWEB_PARAM__PART_NAME:
- case DomPackage.IWEB_PARAM__TARGET_NAMESPACE:
- case DomPackage.IWEB_PARAM__HEADER:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
- @Override
- public String getNameCategory()
- {
- return getString("_UI_WebParamAnnotationCategory"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceItemProvider.java
deleted file mode 100755
index c894082..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceItemProvider.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebServiceItemProvider
- extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebServiceItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-
- if (itemPropertyDescriptors != null) {
- return itemPropertyDescriptors;
- }
-
- super.getPropertyDescriptors(object);
-
- addServiceEndpointPropertyDescriptor(object);
- addTargetNamespacePropertyDescriptor(object);
- addPortNamePropertyDescriptor(object);
- addWsdlLocationPropertyDescriptor(object);
-
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addServiceEndpointPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebService_serviceEndpoint_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebService_serviceEndpoint_feature", "_UI_IWebService_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE__SERVICE_ENDPOINT,
- false,
- false,
- true,
- null,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Target Namespace feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addTargetNamespacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebService_targetNamespace_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebService_targetNamespace_feature", "_UI_IWebService_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE__TARGET_NAMESPACE,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Port Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addPortNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebService_portName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebService_portName_feature", "_UI_IWebService_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE__PORT_NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Location feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addWsdlLocationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebService_wsdlLocation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebService_wsdlLocation_feature", "_UI_IWebService_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE__WSDL_LOCATION,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This returns IWebService.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, Images.INSTANCE.getImage(Images.IMG_WEB_SERVICE));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public String getText(Object object) {
- String label = ((IWebService)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IWebService_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IWebService.class)) {
- case DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
- return;
- }
-
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
- @Override
- public String getNameCategory()
- {
- return getString("_UI_WebServiceAnnotationCategory"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceProjectItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceProjectItemProvider.java
deleted file mode 100755
index 5681e7a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceProjectItemProvider.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebServiceProjectItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebServiceProjectItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebServiceProject_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebServiceProject_name_feature", "_UI_IWebServiceProject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE_PROJECT__NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(DomPackage.Literals.IWEB_SERVICE_PROJECT__WEB_SERVICES);
- childrenFeatures.add(DomPackage.Literals.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns IWebServiceProject.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, Images.INSTANCE.getImage(Images.IMG_DOM_WS_PROVIDER));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((IWebServiceProject)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IWebServiceProject_type") : //$NON-NLS-1$
- getString("_UI_IWebServiceProject_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IWebServiceProject.class)) {
- case DomPackage.IWEB_SERVICE_PROJECT__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES:
- case DomPackage.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.IWEB_SERVICE_PROJECT__WEB_SERVICES,
- DomFactory.eINSTANCE.createIWebService()));
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES,
- DomFactory.eINSTANCE.createIServiceEndpointInterface()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebTypeItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebTypeItemProvider.java
deleted file mode 100755
index bab35b8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebTypeItemProvider.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebTypeItemProvider
- extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This returns IWebType.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IWebType")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((IWebType)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IWebType_type") : //$NON-NLS-1$
- getString("_UI_IWebType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/Images.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/Images.java
deleted file mode 100755
index c75a909..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/Images.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Images bundle. Use this class when you need to load some image.
- *
- * @author Georgi Vachkov
- */
-public class Images
-{
- public static final Images INSTANCE = new Images();
-
- public static final String IMG_WEB_METHOD = "WebMethod"; //$NON-NLS-1$
- public static final String IMG_WEB_PARAM_IN = "WebParamIn"; //$NON-NLS-1$
- public static final String IMG_WEB_PARAM_OUT = "WebParamOut"; //$NON-NLS-1$
- public static final String IMG_WEB_SERVICE = "WebService"; //$NON-NLS-1$
- public static final String IMG_WEB_SERVICE_GROUP = "WebServiceGroup"; //$NON-NLS-1$
- public static final String IMG_SEI = "SEI"; //$NON-NLS-1$
- public static final String IMG_SEI_GROUP = "SEIGroup"; //$NON-NLS-1$
- public static final String IMG_DOM_WS_PROVIDER = "DOMWSProvider"; //$NON-NLS-1$
- public static final String IMG_ERROR_MARKER = "error_obj"; //$NON-NLS-1$
- public static final String IMG_WARNING_MARKER = "warning_obj"; //$NON-NLS-1$
-
- private static ResourceBundle iconsBundle;
- private static ImageRegistry mImageRegistry;
-
- /**
- * Constructor
- */
- public Images()
- {
- try {
- iconsBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.WSImageBundle"); //$NON-NLS-1$
- }
- catch (MissingResourceException x) {
- (new Logger()).logError("Unable to load image bundle for this plugin!", x); //$NON-NLS-1$
- iconsBundle = null;
- }
- }
-
-
- protected void initializeImageRegistry()
- {
- try {
- mImageRegistry = new ImageRegistry();
-
- mImageRegistry.put(IMG_WEB_SERVICE, getImageResource(iconsBundle
- .getString("IMG_WEB_SERVICE"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WEB_SERVICE_GROUP, getImageResource(iconsBundle
- .getString("IMG_WEB_SERVICE_GROUP"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_SEI, getImageResource(iconsBundle
- .getString("IMG_SEI"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_SEI_GROUP, getImageResource(iconsBundle
- .getString("IMG_SEI_GROUP"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_DOM_WS_PROVIDER, getImageResource(iconsBundle
- .getString("IMG_DOM_WS_PROVIDER"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WEB_METHOD, getImageResource(iconsBundle
- .getString("IMG_WEB_METHOD"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WEB_PARAM_IN, getImageResource(iconsBundle
- .getString("IMG_WEB_PARAM_IN"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WEB_PARAM_OUT, getImageResource(iconsBundle
- .getString("IMG_WEB_PARAM_OUT"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_ERROR_MARKER, getImageResource(iconsBundle
- .getString("IMG_ERROR_MARKER"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WARNING_MARKER, getImageResource(iconsBundle
- .getString("IMG_WARNING_MARKER"))); //$NON-NLS-1$
-
- } catch (RuntimeException e) {
- (new Logger()).logError("Unable to initialize image registry !", e); //$NON-NLS-1$
- }
- }
-
- public ImageRegistry getImageRegistry()
- {
- if (mImageRegistry == null) {
- initializeImageRegistry();
- }
-
- return mImageRegistry;
- }
-
- public Image getImage(String imageName)
- {
- return INSTANCE.getImageRegistry().get(imageName);
- }
-
- public static ImageDescriptor getImageResourceByKey(String resourceName) {
- return getImageResource(iconsBundle.getString(resourceName));
- }
-
- public static ImageDescriptor getImageResource(String resourceName)
- {
- try {
- URL url = DomUi.getDefault().getBundle().getResource(resourceName);
- return ImageDescriptor.createFromURL(url);
- }
- catch (NullPointerException npe) {
- (new Logger()).logError(MessageFormat.format("Unable to locate resource {0}!",resourceName), npe); //$NON-NLS-1$
- return ImageDescriptor.getMissingImageDescriptor();
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMItemPropertyProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMItemPropertyProvider.java
deleted file mode 100755
index 66b3210..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMItemPropertyProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.internal.impl;
-
-import java.beans.PropertyDescriptor;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyDefaults;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults.PropertyDefaultsAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state.PropertyStateAdapterFactory;
-
-/**
- * Extends {@link PropertyDescriptor} to represent property descriptor for DOM objects.
- * This class overrides createPropertyValueWrapper form {@link PropertyDescriptor} to provide
- * custom property wrapper class.
- *
- * @author Georgi Vachkov
- */
-public class DOMItemPropertyProvider extends ItemPropertyDescriptor
-{
- public DOMItemPropertyProvider(AdapterFactory adapterFactory,
- ResourceLocator resourceLocator,
- String displayName,
- String description,
- EStructuralFeature feature,
- boolean isSettable,
- boolean multiLine,
- boolean sortChoices,
- Object staticImage,
- String category,
- String[] filterFlags)
- {
- super(adapterFactory, resourceLocator, displayName, description, feature,
- isSettable, multiLine, sortChoices, staticImage, category, filterFlags);
- }
-
- @Override
- protected Object createPropertyValueWrapper(Object object, Object propertyValue)
- {
- return new DOMPropertyValue(adapterFactory, object, propertyValue, null);
- }
-
- @Override
- public boolean canSetProperty(Object object)
- {
- final IPropertyState state = (IPropertyState)PropertyStateAdapterFactory.INSTANCE.adapt(object, IPropertyState.class);
- if (state != null) {
- super.isSettable = state.isChangeable(feature);
- }
-
- return super.canSetProperty(object);
- }
-
- @Override
- public void resetPropertyValue(Object object)
- {
- final IPropertyDefaults defaults = (IPropertyDefaults)PropertyDefaultsAdapterFactory.INSTANCE.adapt(object, IPropertyDefaults.class);
- if (defaults != null) {
- final Object defaultValue = defaults.getDefault(feature);
- ((EObject)object).eSet(feature, defaultValue);
- }
- else {
- super.resetPropertyValue(object);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMPropertyValue.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMPropertyValue.java
deleted file mode 100755
index e4c521c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMPropertyValue.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.internal.impl;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.ws.jaxws.dom.ui.IDOMPropertyValue;
-
-/**
- * Implementor of {@link IDOMPropertyValue}.
- *
- * @author Georgi Vachkov
- */
-public class DOMPropertyValue extends ItemPropertyDescriptor.PropertyValueWrapper implements IDOMPropertyValue
-{
- public DOMPropertyValue(AdapterFactory adapterFactory, Object object, Object propertyValue, Object nestedPropertySourc)
- {
- super(adapterFactory, object, propertyValue, nestedPropertySourc);
- }
-
- public Object getEditableValue() {
- return getEditableValue(null);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/DomUi.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/DomUi.java
deleted file mode 100755
index 29a5752..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/DomUi.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Dom edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class DomUi extends EMFPlugin
-{
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final DomUi INSTANCE = new DomUi();
-
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomUi()
- {
- super
- (new ResourceLocator []
- {
- });
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- @Override
- public ResourceLocator getPluginResourceLocator()
- {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin()
- {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class Implementation extends EclipsePlugin
- {
- /**
- * Creates an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Implementation()
- {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Plugin getDefault()
- {
- return plugin;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/WSImageBundle.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/WSImageBundle.properties
deleted file mode 100755
index b4aaf02..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/WSImageBundle.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-IMG_WEB_SERVICE=icons/Web_Service.gif
-IMG_WEB_SERVICE_GROUP=icons/Web_Service_Group.gif
-IMG_SEI=icons/SEI.gif
-IMG_SEI_GROUP=icons/SEI_Group.gif
-IMG_DOM_WS_PROVIDER=icons/Web_Service_Item_Provider.gif
-IMG_WEB_METHOD=icons/Web_Method.gif
-IMG_WEB_PARAM_IN=icons/Web_Param_In.gif
-IMG_WEB_PARAM_OUT=icons/Web_Param_Out.gif
-IMG_ERROR_MARKER=icons/error_obj.gif
-IMG_WARNING_MARKER=icons/warning_obj.gif
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath b/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath
deleted file mode 100755
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.project b/bundles/org.eclipse.jst.ws.jaxws.ui/.project
deleted file mode 100755
index e5a0fde..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index f6eebfa..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Dec 18 11:00:26 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index c052ed3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.ui;singleton:=true
-Bundle-Version: 0.5.2.qualifier
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jst.ws.jaxws.dom.runtime;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0",
- javax.xml.ws.http;version="2.1.0",
- javax.xml.ws.soap;version="2.1.0",
- org.jdom;version="1.0.0",
- org.jdom.input;version="1.0.0"
-Export-Package: org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;x-internal:=true
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/about.html b/bundles/org.eclipse.jst.ws.jaxws.ui/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</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
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties
deleted file mode 100755
index d4e6333..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- icons/,\
- about.html,\
- plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif
deleted file mode 100644
index a4c9e60..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/etool16/newhandler_wiz.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/etool16/newhandler_wiz.gif
deleted file mode 100644
index 5ac5678..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/etool16/newhandler_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif
deleted file mode 100755
index 435d62e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif
deleted file mode 100644
index d11c996..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif
deleted file mode 100644
index 896e2f0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif
deleted file mode 100644
index 4428ef3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif
deleted file mode 100644
index 115f6bf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/wizban/new_wiz.png b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/wizban/new_wiz.png
deleted file mode 100644
index 6b410e2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/wizban/new_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
deleted file mode 100644
index 165dd4d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for JAXWS UI
-pluginName=JAX-WS Tools UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-ANNOTATIONS_VIEW_CATEGORY_NAME=JAX-WS
-ANNOTATIONS_VIEW_NAME=Annotation Properties
-
-#JAX-WS Handler Wizard
-JAXWS_WIZARD_CATEGORY_NAME=JAX-WS
-NEW_JAXWS_HANDLER_LABEL=JAX-WS Handler
-NEW_JAXWS_HANDLER__DESCRIPTION=Create a JAX-WS Handler
-
-CONFIGURE_HANDLERS_LABEL=Configure Handlers
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml
deleted file mode 100755
index 7d3ecbf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <extension point="org.eclipse.ui.views">
- <category
- name="%ANNOTATIONS_VIEW_CATEGORY_NAME"
- id="org.eclipse.jst.ws.jwst.ui">
- </category>
- <view
- name="%ANNOTATIONS_VIEW_NAME"
- icon="icons/eview16/prop_ps.gif"
- category="org.eclipse.jst.ws.jwst.ui"
- class="org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsView"
- id="org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView">
- </view>
- </extension>
-
- <!-- <extension point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
- <view
- relative="org.eclipse.ui.views.ProblemView"
- relationship="stack"
- id="org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView">
- </view>
- </perspectiveExtension>
- </extension> -->
-
- <extension point="org.eclipse.jst.ws.annotations.core.annotationInitializer">
- <initializer
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.WebServiceAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebMethod"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.WebMethodAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebParam"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.WebParamAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebResult"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.WebResultAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.soap.SOAPBinding"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.SOAPBindingAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.xml.ws.RequestWrapper"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.RequestWrapperAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.xml.ws.ResponseWrapper"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.ResponseWrapperAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.xml.ws.BindingType"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.BindingTypeAttributeInitializer">
- </initializer>
- </extension>
-
- <extension id="jaxwsProposalComputer"
- name="JAX-WS Proposals"
- point="org.eclipse.jdt.ui.javaCompletionProposalComputer">
- <proposalCategory
- icon="icons/eview16/annotation_obj.gif">
- </proposalCategory>
- </extension>
-
- <extension id="JAXWSJavaCompletionProposalComputer"
- point="org.eclipse.jdt.ui.javaCompletionProposalComputer">
- <javaCompletionProposalComputer
- activate="true"
- categoryId="org.eclipse.jst.ws.jaxws.ui.jaxwsProposalComputer"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.contentassist.AnnotationCompletionProposalComputer">
- <partition
- type="__dftl_partition_content_type">
- </partition>
- <partition
- type="__java_string">
- </partition>
- </javaCompletionProposalComputer>
- </extension>
-
- <extension point="org.eclipse.jdt.ui.quickFixProcessors">
- <quickFixProcessor
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.JAXWSQuickFixProcessor"
- id="org.eclipse.jst.ws.jaxws.ui.annotations.correction.JAXWSQuickFixProcessor">
- <handledMarkerTypes>
- <markerType id="org.eclipse.jdt.apt.core.compile.problem"/>
- <markerType id="org.eclipse.jdt.apt.core.nonreconcile.compile.problem"/>
- </handledMarkerTypes>
- </quickFixProcessor>
- </extension>
-
- <extension point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.jdt.apt.core.compile.problem"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.APTCompileProblemMarkerResolutionGenerator">
- </markerResolutionGenerator>
- <markerResolutionGenerator
- markerType="org.eclipse.jdt.apt.core.nonreconcile.compile.problem"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.APTCompileProblemMarkerResolutionGenerator">
- </markerResolutionGenerator>
- </extension>
-
- <extension point="org.eclipse.ui.newWizards">
- <wizard
- category="org.eclipse.jst.ws.ui.new/org.eclipse.jst.ws.jaxws.ui.wizards.category"
- icon="$nl$/icons/etool16/newhandler_wiz.gif"
- id="org.eclipse.jst.ws.internal.jaxws.ui.wizards.NewJAXWSHandlerWizard"
- name="%NEW_JAXWS_HANDLER_LABEL">
- <class class="org.eclipse.jst.ws.internal.jaxws.ui.wizards.NewJAXWSHandlerWizard">
- <parameter name="javatype" value="true"/>
- </class>
- <description>
- %NEW_JAXWS_HANDLER__DESCRIPTION
- </description>
- </wizard>
- <category
- id="org.eclipse.jst.ws.jaxws.ui.wizards.category"
- name="%JAXWS_WIZARD_CATEGORY_NAME"
- parentCategory="org.eclipse.jst.ws.ui.new">
- </category>
- </extension>
-
- <extension point="org.eclipse.ui.menus">
- <menuContribution locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions">
- <command
- commandId="org.eclipse.jst.ws.jaxws.ui.configure.handlers"
- id="jaxws.configure.handlers"
- label="%CONFIGURE_HANDLERS_LABEL"
- style="push">
- <visibleWhen checkEnabled="true"/>
- </command>
- </menuContribution>
- </extension>
-
- <extension point="org.eclipse.ui.commands">
- <command
- id="org.eclipse.jst.ws.jaxws.ui.configure.handlers"
- name="%CONFIGURE_HANDLERS_LABEL">
- </command>
- </extension>
-
- <extension point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.jst.ws.internal.jaxws.ui.handlers.ConfigureHandlerChainHandler"
- commandId="org.eclipse.jst.ws.jaxws.ui.configure.handlers">
- <activeWhen>
- <reference definitionId="org.eclipse.jst.ws.jaxws.webservice.selected"/>
- </activeWhen>
- <enabledWhen>
- <reference definitionId="org.eclipse.jst.ws.jaxws.webservice.selected"/>
- </enabledWhen>
- </handler>
- </extension>
-
- <extension point="org.eclipse.core.expressions.definitions">
- <definition id="org.eclipse.jst.ws.jaxws.webservice.selected">
- <with variable="selection">
- <and>
- <count value="1"/>
- <iterate operator="or">
- <or>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService"/>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface"/>
- </or>
- </iterate>
- </and>
- </with>
- </definition>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java
deleted file mode 100755
index 9e49f03..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JAXWSUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages"; //$NON-NLS-1$
-
- public static String ANNOTATION_ARRAY_CELL_EDITOR_ADD_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED;
-
- public static String ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX;
-
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME;
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION;
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME;
-
- public static String ANNOTATIONS_VIEW_FILTER_ACTION_NAME;
- public static String ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE;
-
- public static String ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND;
- public static String ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE;
-
- public static String CONFIGURE_JAVA_1_6_LIBRARY;
-
- public static String ADD_ANNOTATION;
- public static String ADD_MISSING_METHOD;
- public static String ADD_UNIMPLEMENTED_METHODS;
- public static String CHANGE_METHOD_VISIBILITY;
- public static String CHANGE_METHOD_RETURN_TYPE;
- public static String CREATE_CONSTRUCTOR;
- public static String REMOVE_ANNOTATION;
- public static String REMOVE_METHOD;
- public static String REMOVE_FINAL_MODIFIER;
- public static String REMOVE_ILLEGAL_MODIFIER;
- public static String REMOVE_STATIC_MODIFIER;
- public static String REMOVE_MEMBERVALUEPAIR;
- public static String REMOVE_ALL_OTHER_MEMBERVALUEPAIRS;
-
- public static String JAXWS_HANDLER_WIZARD_TITLE;
- public static String JAXWS_HANDLER_WIZARD_PAGE_TITLE;
- public static String JAXWS_HANDLER_WIZARD_PAGE_DESCRIPTION;
-
- public static String JAXWS_ADD_HANDLER_WIZARD_PAGE_TITLE;
- public static String JAXWS_ADD_HANDLER_WIZARD_PAGE_DESCRIPTION;
-
- public static String JAXWS_ORDER_HANDLER_WIZARD_PAGE_TITLE;
- public static String JAXWS_ORDER_HANDLER_WIZARD_PAGE_DESCRIPTION;
-
- public static String JAXWS_CONFIGURE_HANDLER_WIZARD_TITLE;
-
- public static String JAXWS_HANDLER_ADD;
- public static String JAXWS_HANDLER_REMOVE;
-
- public static String JAXWS_HANDLER_MOVE_UP;
- public static String JAXWS_HANDLER_MOVE_DOWN;
-
- public static String JAXWS_HANDLER_NAME_COLUMN;
- public static String JAXWS_HANDLER_CLASS_COLUMN;
- public static String JAXWS_HANDLER_TYPE_COLUMN;
-
- public static String JAXWS_LOGICAL;
- public static String JAXWS_PROTOCOL;
-
- public static String JAXWS_HANDLER_TYPE;
- public static String JAXWS_LOGICAL_HANDLER;
- public static String JAXWS_SOAP_HANDLER;
- public static String JAXWS_HANDLER_CONFIGURATION;
- public static String JAXWS_HANDLER_CONFIGURATION_ADD;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT;
- public static String JAXWS_HANDLER_CONFIGURATION_CHOOSE;
- public static String JAXWS_HANDLER_CONFIGURATION_ASSOCIATE;
- public static String JAXWS_HANDLER_CONFIGURATION_WEB_SERVICE;
- public static String JAXWS_HANDLER_CONFIGURATION_FILE_PATH;
- public static String JAXWS_HANDLER_CONFIGURATION_BROWSE;
-
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_TITLE;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_DESCRIPTION;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_NAME;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_ENTER_NAME;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_CHOOSE_FOLDER;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME;
-
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_TITLE;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_DESCRIPTION;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_INVALID;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND_IN_PROJECT;
-
- public static String JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_TITLE;
- public static String JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_DESCRIPTION;
- public static String JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_INVALID;
- public static String JAXWS_HANDLER_CONFIGURATION_WS_NOT_FOUND;
-
- public static String JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_TITLE;
- public static String JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_DESCRIPTION;
- public static String JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_INVALID;
-
- public static String JAXWS_HANDLER_CONFIGURATION_NEW_HANDLER_PATH_EMTPY;
- public static String JAXWS_HANDLER_CONFIGURATION_EXISTING_HANDLER_PATH_EMTPY;
- public static String JAXWS_HANDLER_CONFIGURATION_WS_PATH_EMTPY;
-
- public static String JAXWS_HANDLER_EXTEND_IMPLEMENT_HANDLER;
- public static String JAXWS_HANDLER_LIBRARY_CLASSPATH;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, JAXWSUIMessages.class);
- }
-
- private JAXWSUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties
deleted file mode 100644
index 9f4aaaa..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties
+++ /dev/null
@@ -1,115 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-ANNOTATION_ARRAY_CELL_EDITOR_ADD_LABEL=Add
-ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL=Browse...
-ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL=Down
-ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE=Edit Array Values
-ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL=Remove
-ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE=Select Class
-ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL=Up
-ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED=Nested Arrays within Arrays not yet supported
-ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX=Not a valid
-
-ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION=Annotations not available for current selection
-ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME=Values
-ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME=Annotations
-
-ANNOTATIONS_VIEW_FILTER_ACTION_NAME=Filters...
-ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE=Select Annotation Categories to Filter
-
-ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND=No suitable {0} library can be found on the projects classpath.\n\n
-
-ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE=\n(For use with non JAX-WS libraries please setup the project with the required libraries.)\n\n
-
-JAXWS_HANDLER_WIZARD_TITLE=New JAX-WS Handler
-JAXWS_HANDLER_WIZARD_PAGE_TITLE=JAX-WS Handler
-JAXWS_HANDLER_WIZARD_PAGE_DESCRIPTION=Create a new JAX-WS Handler.
-
-JAXWS_ADD_HANDLER_WIZARD_PAGE_TITLE=Configure Handler Chain
-JAXWS_ADD_HANDLER_WIZARD_PAGE_DESCRIPTION=Create or select a handler chain file to associate with the web service.
-
-JAXWS_ORDER_HANDLER_WIZARD_PAGE_TITLE=Configure Handler Chain
-JAXWS_ORDER_HANDLER_WIZARD_PAGE_DESCRIPTION=Configure the position of the handlers in the handler chain file.
-
-JAXWS_CONFIGURE_HANDLER_WIZARD_TITLE=Configure JAX-WS Handler Chain
-
-JAXWS_HANDLER_ADD=&Add...
-JAXWS_HANDLER_REMOVE=&Remove...
-JAXWS_HANDLER_MOVE_UP=Move &Up
-JAXWS_HANDLER_MOVE_DOWN=Move &Down
-
-JAXWS_HANDLER_NAME_COLUMN=Name
-JAXWS_HANDLER_CLASS_COLUMN=Class
-JAXWS_HANDLER_TYPE_COLUMN=Type
-
-JAXWS_LOGICAL=Logical
-JAXWS_PROTOCOL=Protocol
-
-JAXWS_HANDLER_TYPE=&Handler type:
-JAXWS_LOGICAL_HANDLER=Logical Handler
-JAXWS_SOAP_HANDLER=Protocol Handler (SOAP)
-JAXWS_HANDLER_CONFIGURATION=Configuration
-JAXWS_HANDLER_CONFIGURATION_ADD=Add this handler to a handler chain
-JAXWS_HANDLER_CONFIGURATION_CREATE=Create a new handler chain file
-JAXWS_HANDLER_CONFIGURATION_EDIT=Add this handler to an existing handler chain file
-JAXWS_HANDLER_CONFIGURATION_CHOOSE=Choose an existing handler chain file
-JAXWS_HANDLER_CONFIGURATION_ASSOCIATE=Associate this handler chain with a web service
-JAXWS_HANDLER_CONFIGURATION_WEB_SERVICE=Web Service:
-JAXWS_HANDLER_CONFIGURATION_FILE_PATH=File path:
-JAXWS_HANDLER_CONFIGURATION_BROWSE=Browse...
-
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_TITLE=Handler Chain Creation
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_DESCRIPTION=Select the parent folder:
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_NAME=File name:
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_ENTER_NAME=Handler chain file name cannot be empty.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_CHOOSE_FOLDER=Choose parent folder.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME=Invalid handler chain file name.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS=The {0} file already exists.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT=The handler chain file must reside within a source folder in the {0} project.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME=Handler chain file name cannot be empty
-
-JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_TITLE=Handler Chain Selection
-JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_DESCRIPTION=Choose a handler chain:
-JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_INVALID=Not a valid handler chain file.
-JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND=Cannot find the {0} handler chain file.
-JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND_IN_PROJECT=Cannot find the {0} handler chain file in the {1} project.
-
-JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_TITLE=Web Service Selection
-JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_DESCRIPTION=Choose a web service:
-JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_INVALID=Not a Web Service.
-
-JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_TITLE=Handler Selection
-JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_DESCRIPTION=Choose a logical or soap handler:
-JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_INVALID=Not a logical or soap handler.
-
-JAXWS_HANDLER_CONFIGURATION_NEW_HANDLER_PATH_EMTPY=New handler chain path is empty.
-JAXWS_HANDLER_CONFIGURATION_EXISTING_HANDLER_PATH_EMTPY=Exisitng handler chain path is empty.
-JAXWS_HANDLER_CONFIGURATION_WS_PATH_EMTPY=Web service path is empty.
-JAXWS_HANDLER_CONFIGURATION_WS_NOT_FOUND=Web service cannot be found.
-
-JAXWS_HANDLER_EXTEND_IMPLEMENT_HANDLER=The handler class must implement or extend from a class that implements LogicalHandler or SOAPHandler.
-JAXWS_HANDLER_LIBRARY_CLASSPATH=A JAX-WS library cannot be found on the projects classpath.
-
-CONFIGURE_JAVA_1_6_LIBRARY=To select a 1.6 or above compliant JRE configure the <a href="1" >Installed JREs</a> or change the JRE on the <a href="2" >Java build path</a>.
-
-ADD_ANNOTATION=Add annotation ''@{0}''
-ADD_MISSING_METHOD=Add missing method
-ADD_UNIMPLEMENTED_METHODS=Add unimplemented methods
-CHANGE_METHOD_VISIBILITY=Change method visibility to ''{0}''
-CHANGE_METHOD_RETURN_TYPE=Change method return type to match SEI method return type
-CREATE_CONSTRUCTOR=Create constructor ''{0}()''
-REMOVE_ANNOTATION=Remove annotation ''@{0}''
-REMOVE_METHOD=Remove method ''{0}''
-REMOVE_FINAL_MODIFIER=Remove ''final'' modifier of ''{0}''(..)
-REMOVE_ILLEGAL_MODIFIER=Remove Illegal modifier
-REMOVE_STATIC_MODIFIER=Remove ''static'' modifier of ''{0}''(..)
-REMOVE_MEMBERVALUEPAIR=Remove member value pair ''{0}''
-REMOVE_ALL_OTHER_MEMBERVALUEPAIRS=Remove all other member value pairs
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
deleted file mode 100755
index cc61dc9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JAXWSUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static JAXWSUIPlugin plugin;
-
- /**
- * The constructor
- */
- public JAXWSUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#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 JAXWSUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
- public static void logMessage(int severity, String message) {
- JAXWSUIPlugin.log(new Status(severity, JAXWSUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- JAXWSUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- JAXWSUIPlugin.log(new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java
deleted file mode 100644
index 6b8f334..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.actions;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsView;
-import org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsViewCategoryFilter;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-
-public class AnnotationsViewFilterAction extends Action {
- private StructuredViewer viewer;
- private AnnotationsViewCategoryFilter categoryFilter;
-
- public AnnotationsViewFilterAction(AnnotationsView annotationsView, StructuredViewer viewer, String text) {
- super(text);
- this.viewer = viewer;
- this.setImageDescriptor(JAXWSUIPlugin.getImageDescriptor("icons/elcl16/filter_ps.gif")); //$NON-NLS-1$
- categoryFilter = new AnnotationsViewCategoryFilter(annotationsView, viewer);
- }
-
- @Override
- public void run() {
- ListSelectionDialog listSelectionDialog = new ListSelectionDialog(viewer.getControl().getShell(),
- AnnotationsManager.getAnnotationCategories(), new AnnotationsCategoryDialogContentProvider(),
- new AnnotationsCategoryDialogLabelProvider(),
- JAXWSUIMessages.ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE);
-
- listSelectionDialog.setInitialElementSelections(categoryFilter.getCategories());
-
- int returnValue = listSelectionDialog.open();
- if (returnValue == Window.OK) {
- Object[] result = listSelectionDialog.getResult();
- categoryFilter.filterAnnotations(Arrays.asList(result));
- }
- }
-
- public void init(IMemento memento) {
- categoryFilter.init(memento);
- }
-
- public void saveState(IMemento memento) {
- categoryFilter.saveState(memento);
- }
-
- private static class AnnotationsCategoryDialogContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof List) {
- return ((List<String>)inputElement).toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- }
-
- private static class AnnotationsCategoryDialogLabelProvider extends LabelProvider {
- public String getText(Object element) {
- return element.toString();
- }
-
- public Image getImage(Object element) {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
deleted file mode 100644
index f63f52c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.contentassist;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.CompletionContext;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
-import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class AnnotationCompletionProposalComputer implements IJavaCompletionProposalComputer {
-
- public AnnotationCompletionProposalComputer() {
- super();
- }
-
- @SuppressWarnings("unchecked")
- public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
- if (context instanceof JavaContentAssistInvocationContext) {
- return computeCompletionProposals((JavaContentAssistInvocationContext) context);
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> computeCompletionProposals(JavaContentAssistInvocationContext context) {
- CompletionContext completionContext = context.getCoreContext();
- int tokenStart = completionContext.getOffset();
-
- ICompilationUnit source = context.getCompilationUnit();
- try {
- IJavaElement javaElement = source.getElementAt(tokenStart);
- if (javaElement != null) {
- switch(javaElement.getElementType()) {
- case IJavaElement.PACKAGE_DECLARATION:
- case IJavaElement.TYPE:
- case IJavaElement.FIELD:
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- javaElement), javaElement, tokenStart);
- case IJavaElement.METHOD:
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable((IMethod) javaElement, tokenStart);
- if (localVariable != null) {
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- localVariable), localVariable, tokenStart);
- } else {
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- javaElement), javaElement, tokenStart);
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(List<Annotation> annotations,
- IJavaElement javaElement, int offset) {
- for (Annotation annotation : annotations) {
- if (annotation instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation, offset);
- if (memberValuePair != null) {
- return getCompletionProposalsForJavaElement(normalAnnotation, memberValuePair,
- javaElement);
- }
- }
-
- if (annotation instanceof SingleMemberAnnotation) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- if (isWithinSingleMemberAnnotationValue(singleMemberAnnotation, offset)) {
- return getCompletionProposalsForJavaElement(singleMemberAnnotation, javaElement);
- }
- }
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(NormalAnnotation annotation,
- MemberValuePair memberValuePair, IJavaElement javaElement) {
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager
- .getAnnotationAttributeInitializerForName(annotation.getTypeName());
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getCompletionProposalsForMemberValuePair(javaElement,
- memberValuePair);
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(SingleMemberAnnotation annotation,
- IJavaElement javaElement) {
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager
- .getAnnotationAttributeInitializerForName(annotation.getTypeName());
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getCompletionProposalsForSingleMemberAnnotation(javaElement,
- annotation);
- }
- return Collections.emptyList();
- }
-
-
- @SuppressWarnings("unchecked")
- private MemberValuePair getMemberValuePairForPosition(NormalAnnotation normalAnnotation, int offset) {
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- Expression value = memberValuePair.getValue();
- int valueStartPosition = value.getStartPosition();
- int valueLength = value.getLength();
- if (offset >= valueStartPosition
- && offset <= valueStartPosition + valueLength) {
- return memberValuePair;
- }
- }
- return null;
- }
-
- private boolean isWithinSingleMemberAnnotationValue(SingleMemberAnnotation singleMemberAnnotation, int offset) {
- Expression value = singleMemberAnnotation.getValue();
- if (value != null) {
- int valueStartPosition = value.getStartPosition();
- int valueLength = value.getLength();
- return (offset >= valueStartPosition && offset <= valueStartPosition + valueLength);
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public List computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor) {
- return Collections.emptyList();
- }
-
- public String getErrorMessage() {
- return null;
- }
-
- public void sessionEnded() {
- }
-
- public void sessionStarted() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java
deleted file mode 100644
index 9dc9d6a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.apt.core.util.EclipseMessager;
-import org.eclipse.jdt.core.CorrectionEngine;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModelMarker;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionProcessor;
-import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
-import org.eclipse.jdt.internal.ui.text.correction.CorrectionMarkerResolutionGenerator.CorrectionMarkerResolution;
-import org.eclipse.jdt.ui.text.java.CompletionProposalComparator;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator2;
-import org.eclipse.ui.part.FileEditorInput;
-
-@SuppressWarnings("restriction")
-public class APTCompileProblemMarkerResolutionGenerator implements IMarkerResolutionGenerator2 {
-
- private final static IMarkerResolution[] NO_RESOLUTIONS = new IMarkerResolution[0];
-
- public boolean hasResolutions(IMarker marker) {
- int id = marker.getAttribute(IJavaModelMarker.ID, -1);
- if (id == EclipseMessager.APT_QUICK_FIX_PROBLEM_ID) {
- return true;
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public IMarkerResolution[] getResolutions(IMarker marker) {
- if (!hasResolutions(marker)) {
- return NO_RESOLUTIONS;
- }
-
- ICompilationUnit compilationUnit = getCompilationUnit(marker);
-
- if (compilationUnit != null) {
- IEditorInput editorInput = new FileEditorInput((IFile) compilationUnit.getResource());
- if (editorInput != null) {
- IProblemLocation problemLocation = createProblemLocation(marker);
- if (problemLocation != null) {
- IInvocationContext invocationContext = new AssistContext(compilationUnit,
- problemLocation.getOffset(), problemLocation.getLength());
-
- List<IJavaCompletionProposal> completionProposals = new ArrayList<IJavaCompletionProposal>();
-
- IStatus status = JavaCorrectionProcessor.collectCorrections(invocationContext,
- new IProblemLocation[] { problemLocation }, completionProposals);
-
- if (status.isOK()) {
- Collections.sort(completionProposals, new CompletionProposalComparator());
-
- IMarkerResolution[] markerResolutions = new IMarkerResolution[completionProposals.size()];
- for (int i= 0; i < completionProposals.size(); i++) {
- markerResolutions[i] = new CorrectionMarkerResolution(compilationUnit,
- problemLocation.getOffset(), problemLocation.getLength(),
- completionProposals.get(i), marker);
- }
- return markerResolutions;
- }
- }
- }
- }
- return NO_RESOLUTIONS;
- }
-
- private IProblemLocation createProblemLocation(IMarker marker) {
- try {
- int id = marker.getAttribute(IJavaModelMarker.ID, -1);
- int offset = marker.getAttribute(IMarker.CHAR_START, -1);
- int end = marker.getAttribute(IMarker.CHAR_END, -1);
- int severity = marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
- String[] arguments = CorrectionEngine.getProblemArguments(marker);
- String markerType = marker.getType();
- if (id != -1 && offset != -1 && end != -1 && arguments != null) {
- int length = end - offset;
- boolean isError = (severity == IMarker.SEVERITY_ERROR);
- return new ProblemLocation(offset, length, id, arguments, isError, markerType);
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- }
- return null;
- }
-
- private ICompilationUnit getCompilationUnit(IMarker marker) {
- IResource resource = marker.getResource();
- if (resource instanceof IFile && resource.isAccessible()) {
- IJavaElement javaElement = JavaCore.create((IFile) resource);
- if (javaElement != null && javaElement instanceof ICompilationUnit) {
- return (ICompilationUnit) javaElement;
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java
deleted file mode 100644
index 816238a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public abstract class AbstractJavaCorrectionPropsoal implements IJavaCompletionProposal {
-
- private int relevance;
- private String displayString;
- private Image image;
- private TextFileChange textChange;
-
- protected IInvocationContext invocationContext;
-
- public AbstractJavaCorrectionPropsoal(IInvocationContext invocationContext, String displayString, int relevance, Image image) {
- this.invocationContext = invocationContext;
- this.displayString = displayString;
- this.relevance = relevance;
- this.image = image;
- }
-
- public int getRelevance() {
- return relevance;
- }
-
- public abstract void addEdits(TextFileChange textChange) throws CoreException;
-
- private TextFileChange getTextChange() throws CoreException {
- if (textChange == null) {
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
- textChange = new TextFileChange(getDisplayString(), (IFile) compilationUnit.getResource()); //$NON-NLS-1$
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textChange.setEdit(multiTextEdit);
- textChange.setKeepPreviewEdits(true);
- textChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
- addEdits(textChange);
- }
- return textChange;
- }
-
- public void apply(IDocument document) {
- IProgressMonitor monitor = new NullProgressMonitor();
- IUndoManager manager= RefactoringCore.getUndoManager();
- boolean successful = false;
- Change undoChange = null;
- try {
- textChange = getTextChange();
- textChange.initializeValidationData(monitor);
- RefactoringStatus valid = textChange.isValid(monitor);
- if (valid.isOK()) {
- manager.aboutToPerformChange(textChange);
- undoChange = textChange.perform(monitor);
- successful = true;
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- } finally {
- manager.changePerformed(textChange, successful);
- }
- if (undoChange != null) {
- undoChange.initializeValidationData(monitor);
- manager.addUndo(undoChange.getName(), undoChange);
- }
- }
-
- public String getAdditionalProposalInfo() {
- return null;
- }
-
-
- public IContextInformation getContextInformation() {
- return null;
- }
-
- public String getDisplayString() {
- return displayString;
- }
-
- public Image getImage() {
- return image;
- }
-
- public Point getSelection(IDocument document) {
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java
deleted file mode 100644
index c191a9c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.text.edits.TextEdit;
-
-public class AddAnnotationToTypeCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private Class<? extends java.lang.annotation.Annotation> annotationClass;
-
- public AddAnnotationToTypeCorrectionProposal(IInvocationContext invocationContext,
- Class<? extends java.lang.annotation.Annotation> annotationClass, String displayString, int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.annotationClass = annotationClass;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
-
- CompilationUnit astRoot = invocationContext.getASTRoot();
-
- AST ast = astRoot.getAST();
-
- IAnnotationAttributeInitializer annotationAttributeInitializer =
- AnnotationsManager.getAnnotationDefinitionForClass(annotationClass).
- getAnnotationAttributeInitializer();
-
- List<MemberValuePair> memberValuePairs = annotationAttributeInitializer.getMemberValuePairs(
- compilationUnit.findPrimaryType(), ast, annotationClass);
-
- Annotation annotation = AnnotationsCore.createNormalAnnotation(ast, annotationClass.getSimpleName(),
- memberValuePairs);
-
- textChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(compilationUnit.findPrimaryType(), annotation));
-
- ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
- importRewrite.addImport(annotationClass.getCanonicalName());
- if (importRewrite.hasRecordedChanges()) {
- TextEdit importTextEdit = importRewrite.rewriteImports(null);
- textChange.addEdit(importTextEdit);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddUnimplementedMethodCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddUnimplementedMethodCorrectionProposal.java
deleted file mode 100644
index 1a72a01..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddUnimplementedMethodCorrectionProposal.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility2;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-@SuppressWarnings("restriction")
-public class AddUnimplementedMethodCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private ASTNode typeDeclaration;
- private String endpointInterface;
-
- public AddUnimplementedMethodCorrectionProposal(IInvocationContext invocationContext, ASTNode typeDeclaration,
- String endpointInterface, String displayString, int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.endpointInterface = endpointInterface;
- this.typeDeclaration = typeDeclaration;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- IMethodBinding[] unimplementedMethods = getUnimplementedMethods(typeDeclaration, endpointInterface);
- if (unimplementedMethods.length == 0) {
- return;
- }
-
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
-
- CompilationUnit astRoot = invocationContext.getASTRoot();
-
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- CodeGenerationSettings settings = JavaPreferencesSettings.getCodeGenerationSettings(compilationUnit.getJavaProject());
- settings.overrideAnnotation = false;
-
- AbstractTypeDeclaration abstractTypeDeclaration = (AbstractTypeDeclaration) typeDeclaration;
- ListRewrite listRewrite = rewriter.getListRewrite(abstractTypeDeclaration,
- abstractTypeDeclaration.getBodyDeclarationsProperty());
-
- ImportRewrite importRewrite = ImportRewrite.create(astRoot, true);
-
- for (int i = 0; i < unimplementedMethods.length; i++) {
- IMethodBinding methodBinding = unimplementedMethods[i];
- MethodDeclaration methodDeclaration = StubUtility2.createImplementationStub(compilationUnit, rewriter,
- importRewrite, importRewrite.getDefaultImportRewriteContext(), methodBinding,
- methodBinding.getDeclaringClass().getName(), settings, false);
- listRewrite.insertLast(methodDeclaration, null);
- }
- textChange.addEdit(rewriter.rewriteAST());
- if (importRewrite.hasRecordedChanges()) {
- textChange.addEdit(importRewrite.rewriteImports(null));
- }
- }
-
- public IMethodBinding[] getMethodsToImplement() {
- return getUnimplementedMethods(typeDeclaration, endpointInterface);
- }
-
- private IMethodBinding[] getUnimplementedMethods(ASTNode typeDeclaration, String endpointInterface) {
- List<IMethodBinding> methodBindings = new ArrayList<IMethodBinding>();
- if (typeDeclaration.getParent() instanceof CompilationUnit) {
- CompilationUnit implementationCompilationUnit = (CompilationUnit) typeDeclaration.getParent();
- if (implementationCompilationUnit.getJavaElement() instanceof ICompilationUnit) {
- try {
- IJavaProject javaProject = implementationCompilationUnit.getJavaElement().getJavaProject();
- IType seiType = javaProject.findType(endpointInterface);
-
- if (seiType != null) {
- ICompilationUnit sei = seiType.getCompilationUnit();
- CompilationUnit seiCompilationUnit = SharedASTProvider.getAST(sei, SharedASTProvider.WAIT_YES, null);
-
- List<MethodDeclaration> implementationMethods = getMethodDeclarations(
- implementationCompilationUnit);
- List<MethodDeclaration> seiMethods = getMethodDeclarations(seiCompilationUnit);
- for (MethodDeclaration seiMethod : seiMethods) {
- boolean implemented = false;
- for (MethodDeclaration implMethod : implementationMethods) {
- if (AnnotationUtils.compareMethods(seiMethod, implMethod)) {
- implemented = true;
- break;
- }
- }
- if (!implemented) {
- methodBindings.add(seiMethod.resolveBinding());
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
-
- }
- return methodBindings.toArray(new IMethodBinding[methodBindings.size()]);
- }
-
- private List<MethodDeclaration> getMethodDeclarations(CompilationUnit compilationUnit) {
- final List<MethodDeclaration> methodDeclarations = new ArrayList<MethodDeclaration>();
-
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(MethodDeclaration methodDeclaration) {
- methodDeclarations.add(methodDeclaration);
- return false;
- }
- });
- return methodDeclarations;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeModifierCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeModifierCorrectionProposal.java
deleted file mode 100644
index e74c7ef..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeModifierCorrectionProposal.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class ChangeModifierCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private IBinding binding;
- private int includedModifiers;
- private int excludedModifiers;
-
-
- public ChangeModifierCorrectionProposal(IInvocationContext invocationContext, IBinding binding,
- int includedModifiers, int excludedModifiers, String displayString, int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.binding = binding;
- this.includedModifiers = includedModifiers;
- this.excludedModifiers = excludedModifiers;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void addEdits(TextFileChange textChange) throws CoreException {
- CompilationUnit astRoot = invocationContext.getASTRoot();
-
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- ASTNode declaringNode = astRoot.findDeclaringNode(binding);
-
- int consideredModifierFlags = includedModifiers | excludedModifiers;
- int newModifierFlags = includedModifiers & consideredModifierFlags;
-
- ListRewrite listRewrite = getListRewrite(declaringNode, rewriter);
- if (listRewrite != null) {
- List<ASTNode> originalList = listRewrite.getOriginalList();
- for (ASTNode astNode : originalList) {
- if (astNode instanceof Modifier) {
- Modifier modifier = (Modifier) astNode;
- int modifierFlag = modifier.getKeyword().toFlagValue();
- if ((consideredModifierFlags & modifierFlag) != 0) {
- if ((newModifierFlags & modifierFlag) == 0) {
- listRewrite.remove(modifier, null);
- }
- newModifierFlags &= ~modifierFlag;
- }
- }
- }
-
- List<Modifier> modifers = ast.newModifiers(newModifierFlags);
- ASTNode lastAnnotation = getLastAnnotation(listRewrite);
- for (Modifier modifier : modifers) {
- int modifierFlag = modifier.getKeyword().toFlagValue();
- if ((modifierFlag & (Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED)) != 0) {
- if (lastAnnotation != null) {
- listRewrite.insertAfter(modifier, lastAnnotation, null);
- } else {
- listRewrite.insertFirst(modifier, null);
- }
- }
- }
-
- textChange.addEdit(rewriter.rewriteAST());
- }
- }
-
- @SuppressWarnings("unchecked")
- private ASTNode getLastAnnotation(ListRewrite listRewrite) {
- ASTNode lastAnnotation = null;
- List<ASTNode> rewrittenList = listRewrite.getRewrittenList();
- for (ASTNode astNode : rewrittenList) {
- if (astNode instanceof IExtendedModifier) {
- IExtendedModifier extendedModifier = (IExtendedModifier) astNode;
- if (extendedModifier.isAnnotation()) {
- lastAnnotation = astNode;
- }
- }
- }
- return lastAnnotation;
- }
-
- private ListRewrite getListRewrite(ASTNode astNode, ASTRewrite astRewrite) {
- if (astNode instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) astNode;
- return astRewrite.getListRewrite(methodDeclaration, MethodDeclaration.MODIFIERS2_PROPERTY);
- }
- if (astNode instanceof TypeDeclaration) {
- TypeDeclaration typeDeclaration = (TypeDeclaration) astNode;
- return astRewrite.getListRewrite(typeDeclaration, TypeDeclaration.MODIFIERS2_PROPERTY);
- }
-
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeReturnTypeCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeReturnTypeCorrectionProposal.java
deleted file mode 100644
index a96f555..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeReturnTypeCorrectionProposal.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class ChangeReturnTypeCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private TypeDeclaration implTypeDeclaration;
- private MethodDeclaration implMethodDeclaration;
- private String endpointInterface;
-
- public ChangeReturnTypeCorrectionProposal(
- IInvocationContext invocationContext, TypeDeclaration implTypeDeclaration, MethodDeclaration implMethodDeclaration, String endpointInterface, String displayString,
- int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.implTypeDeclaration = implTypeDeclaration;
- this.implMethodDeclaration = implMethodDeclaration;
- this.endpointInterface = endpointInterface;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- MethodDeclaration seiMethodDeclaration = getSEIMethodDeclaration();
- if (seiMethodDeclaration == null) {
- return;
- }
-
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
-
- CompilationUnit astRoot = invocationContext.getASTRoot();
-
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
- ITypeBinding returnType = seiMethodDeclaration.resolveBinding().getReturnType();
- ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
- Type type = importRewrite.addImport(returnType, ast);
- rewriter.set(implMethodDeclaration, MethodDeclaration.RETURN_TYPE2_PROPERTY, type, null);
- rewriter.set(implMethodDeclaration, MethodDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
-
- textChange.addEdit(rewriter.rewriteAST());
- if (importRewrite.hasRecordedChanges()) {
- textChange.addEdit(importRewrite.rewriteImports(null));
- }
- }
-
- private MethodDeclaration getSEIMethodDeclaration() {
- if (implTypeDeclaration.getParent() instanceof CompilationUnit) {
- CompilationUnit implCompilationUnit = (CompilationUnit) implTypeDeclaration.getParent();
- if (implCompilationUnit.getJavaElement() instanceof ICompilationUnit) {
- try {
- IJavaProject javaProject = implCompilationUnit.getJavaElement().getJavaProject();
- IType seiType = javaProject.findType(endpointInterface);
-
- if (seiType != null) {
- ICompilationUnit seiCompilationUnit = seiType.getCompilationUnit();
- CompilationUnit seiASTRoot = SharedASTProvider.getAST(seiCompilationUnit, SharedASTProvider.WAIT_YES, null);
-
- List<MethodDeclaration> seiMethodDeclarations = getMethodDeclarations(seiASTRoot);
- for (MethodDeclaration seiMethodDeclaration : seiMethodDeclarations) {
- if (AnnotationUtils.compareMethods(implMethodDeclaration, seiMethodDeclaration)) {
- return seiMethodDeclaration;
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- }
- return null;
- }
-
- private List<MethodDeclaration> getMethodDeclarations(CompilationUnit compilationUnit) {
- final List<MethodDeclaration> methodDeclarations = new ArrayList<MethodDeclaration>();
-
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(MethodDeclaration methodDeclaration) {
- methodDeclarations.add(methodDeclaration);
- return false;
- }
- });
- return methodDeclarations;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/JAXWSQuickFixProcessor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/JAXWSQuickFixProcessor.java
deleted file mode 100644
index 41c7301..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/JAXWSQuickFixProcessor.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPMessageHandlers;
-import javax.xml.ws.WebServiceProvider;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.apt.core.util.EclipseMessager;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
-import org.eclipse.jdt.ui.JavaElementImageDescriptor;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-import org.eclipse.jdt.ui.text.java.IQuickFixProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-@SuppressWarnings({ "restriction", "deprecation" })
-public class JAXWSQuickFixProcessor implements IQuickFixProcessor {
-
- public boolean hasCorrections(ICompilationUnit unit, int problemId) {
- if (problemId == EclipseMessager.APT_QUICK_FIX_PROBLEM_ID) {
- return true;
- }
- return false;
- }
-
- public IJavaCompletionProposal[] getCorrections(IInvocationContext context, IProblemLocation[] locations)
- throws CoreException {
-
- if (locations == null || locations.length == 0) {
- return null;
- }
-
- List<IJavaCompletionProposal> proposals = new ArrayList<IJavaCompletionProposal>();
-
- Set<String> handled = new HashSet<String>();
- for (IProblemLocation problemLocation : locations) {
- String[] problemArguments = problemLocation.getProblemArguments();
- if (problemArguments.length >= 2) {
- String problem = problemArguments[1];
- if (handled.add(problem)) {
- process(context, problemLocation, proposals);
- }
- }
- }
-
- return proposals.toArray(new IJavaCompletionProposal[proposals.size()]);
- }
-
- private void process(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals) throws CoreException {
-
- String problem = problemLocation.getProblemArguments()[1];
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT)) {
- addUnimplementedMethodsProposal(context, problemLocation, proposals);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE)) {
- addAnnotationToTypeProposal(context, proposals, WebService.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_NAME_ATTRIBUTE)
- || problem.equals(JAXWSCoreMessages.WEBSERVICE_PORTNAME_SEI)
- || problem.equals(JAXWSCoreMessages.WEBSERVICE_SERVICENAME_SEI)
- || problem.equals(JAXWSCoreMessages.WEBSERVICE_ENDPOINTINTERFACE_SEI)
- || problem.equals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI)) {
- addRemoveMemberValuePairProposal(context, problemLocation, proposals, false);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED)) {
- addRemoveMemberValuePairProposal(context, problemLocation, proposals, true);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebMethod.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING)
- || problem.equals(JAXWSCoreMessages.SOAPBINDING_NO_RPC_STYLE_ON_METHODS)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, SOAPBinding.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebResult.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebParam.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, Oneway.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL)) {
- addChangeModifierProposal(context, problemLocation, proposals, 5);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR)) {
- addConstructorProposal(context, problemLocation, proposals, 5);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebServiceProvider.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.HANDLER_CHAIN_SOAP_MESSAGE_HANDLERS)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, SOAPMessageHandlers.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_OVERRIDE_FINALIZE)) {
- addRemoveMethodProposal(context, problemLocation, proposals);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS)
- || problem.equals(JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED)
- || problem.equals(JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED)) {
- addChangeModifierProposal(context, problemLocation, proposals, 5);
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebMethod.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_REDUCED_VISIBILITY)) {
- addChangeModifierProposal(context, problemLocation, proposals, 5);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_INCOMPATIBLE_RETURN_TYPE)) {
- addChangeReturnTypeProposal(context, problemLocation, proposals);
- }
- }
-
- private void addAnnotationToTypeProposal(IInvocationContext context, List<IJavaCompletionProposal> proposals,
- Class<? extends java.lang.annotation.Annotation> annotationClass) {
-
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.ADD_ANNOTATION, annotationClass.getSimpleName());
- Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
- proposals.add(new AddAnnotationToTypeCorrectionProposal(context, annotationClass, displayString, 5, image));
- }
-
- private void addRemoveMethodProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals) {
-
- ASTNode selectedNode = problemLocation.getCoveringNode(context.getASTRoot());
-
- if (selectedNode.getParent() instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) selectedNode.getParent();
- ASTNode parentNode = normalAnnotation.getParent();
- if (parentNode instanceof MethodDeclaration) {
- selectedNode = ((MethodDeclaration) parentNode).getName();
- }
- if (parentNode instanceof SingleVariableDeclaration) {
- SingleVariableDeclaration singleVariableDeclaration = (SingleVariableDeclaration) parentNode;
- selectedNode = ((MethodDeclaration) singleVariableDeclaration.getParent()).getName();
- }
- }
-
- if (selectedNode instanceof SimpleName) {
- SimpleName methodName = (SimpleName) selectedNode;
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_METHOD, methodName.getIdentifier());
- Image image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
-
- proposals.add(new RemoveMethodCorrectionProposal(context, methodName, displayString, 5, image));
- }
- }
-
- private void addRemoveAnnotationProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals, Class<? extends java.lang.annotation.Annotation> annotation) {
-
- ASTNode coveringNode = problemLocation.getCoveringNode(context.getASTRoot());
- ASTNode parentNode = coveringNode.getParent();
-
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_ANNOTATION, annotation.getSimpleName());
- Image image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
- proposals.add(new RemoveAnnotationCorrectionProposal(context, annotation, parentNode, displayString, 5, image));
- }
-
- private void addRemoveMemberValuePairProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals, boolean removeAllOtherMVPs) {
-
- ASTNode coveringNode = problemLocation.getCoveringNode(context.getASTRoot());
-
- if (coveringNode.getParent() instanceof MemberValuePair) {
- MemberValuePair memberValuePair = (MemberValuePair) coveringNode.getParent();
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_MEMBERVALUEPAIR, memberValuePair
- .toString());
-
- if (removeAllOtherMVPs) {
- displayString = JAXWSUIMessages.REMOVE_ALL_OTHER_MEMBERVALUEPAIRS;
- }
- Image image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
- proposals.add(new RemoveMemberValuePairCorrectionProposal(context, memberValuePair,
- removeAllOtherMVPs, displayString, 5, image));
- }
- }
-
- private void addUnimplementedMethodsProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals) {
-
- ASTNode endpointInterfaceValue = problemLocation.getCoveringNode(context.getASTRoot());
- if (endpointInterfaceValue instanceof StringLiteral) {
- ASTNode endpointInterfaceMVP = endpointInterfaceValue.getParent();
- ASTNode webServiceAnnotation = endpointInterfaceMVP.getParent();
- ASTNode typeDeclaration = webServiceAnnotation.getParent();
-
- String endpointInterface = ((StringLiteral) endpointInterfaceValue).getLiteralValue();
-
- Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
- proposals.add(new AddUnimplementedMethodCorrectionProposal(context, typeDeclaration, endpointInterface,
- JAXWSUIMessages.ADD_UNIMPLEMENTED_METHODS, 5, image));
- }
- }
-
- private void addChangeModifierProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals, int relevance) {
-
- CompilationUnit astRoot = context.getASTRoot();
- ASTNode selectedNode = problemLocation.getCoveringNode(astRoot);
-
- if (!(selectedNode instanceof SimpleName)) {
- return;
- }
-
- IBinding binding = ((SimpleName) selectedNode).resolveBinding();
- if (binding != null) {
- String bindingName = binding.getName();
- String displayString = "";
-
- int excludedModifiers = 0;
- int includedModifiers = 0;
-
- String problem = problemLocation.getProblemArguments()[1];
-
- if(problem.equals(JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS)
- || problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_REDUCED_VISIBILITY)) {
- excludedModifiers = ~(Modifier.PUBLIC);
- includedModifiers = Modifier.PUBLIC ;
- displayString = JAXWSUIMessages.bind(JAXWSUIMessages.CHANGE_METHOD_VISIBILITY, "public"); //$NON-NLS-1$
- }
-
- if(problem.equals(JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED)) {
- excludedModifiers = Modifier.FINAL;
- displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_FINAL_MODIFIER, bindingName);
- }
-
- if(problem.equals(JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED)) {
- excludedModifiers = Modifier.STATIC;
- displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_STATIC_MODIFIER, bindingName);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL)) {
- excludedModifiers = Modifier.ABSTRACT | Modifier.FINAL;
- displayString = JAXWSUIMessages.REMOVE_ILLEGAL_MODIFIER;
- }
-
- Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
- proposals.add(new ChangeModifierCorrectionProposal(context, binding, includedModifiers,
- excludedModifiers, displayString, 5, image));
- }
- }
-
- private void addConstructorProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals, int relevance) {
-
- CompilationUnit astRoot = context.getASTRoot();
- ASTNode selectedNode = problemLocation.getCoveringNode(astRoot);
-
- ITypeBinding typeBinding = ((AbstractTypeDeclaration) selectedNode.getParent()).resolveBinding();
- if (typeBinding != null && typeBinding.isFromSource()) {
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.CREATE_CONSTRUCTOR,
- typeBinding.getTypeDeclaration().getName());
-
- Image image = JavaElementImageProvider.getDecoratedImage(JavaPluginImages.DESC_MISC_PUBLIC,
- JavaElementImageDescriptor.CONSTRUCTOR, JavaElementImageProvider.SMALL_SIZE);
-
- proposals.add(new NewDefaultConstructorCorrectionProposal(context, typeBinding, displayString, 5,
- image));
- }
- }
-
- private void addChangeReturnTypeProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals) {
-
- CompilationUnit astRoot = context.getASTRoot();
- ASTNode selectedNode = problemLocation.getCoveringNode(astRoot);
-
- if (!(selectedNode instanceof SimpleName)) {
- return;
- }
-
- MethodDeclaration implMethodDeclaration = (MethodDeclaration)((SimpleName) selectedNode).getParent();
- TypeDeclaration implTypeDeclaration = (TypeDeclaration)implMethodDeclaration.getParent();
-
- Annotation annotation = AnnotationUtils.getAnnotation(implTypeDeclaration.resolveBinding().getJavaElement(), WebService.class);
-
- String endpointInterface = AnnotationUtils.getStringValue(annotation, "endpointInterface"); //$NON-NLS-1$
- String displayString = JAXWSUIMessages.CHANGE_METHOD_RETURN_TYPE;
- Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
- proposals.add(new ChangeReturnTypeCorrectionProposal(context, implTypeDeclaration,
- implMethodDeclaration, endpointInterface, displayString, 5, image));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/NewDefaultConstructorCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/NewDefaultConstructorCorrectionProposal.java
deleted file mode 100644
index ae20733..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/NewDefaultConstructorCorrectionProposal.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Block;
-import org.eclipse.jdt.core.dom.ChildListPropertyDescriptor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.ui.CodeGeneration;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class NewDefaultConstructorCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private ITypeBinding typeBinding;
-
- public NewDefaultConstructorCorrectionProposal(
- IInvocationContext invocationContext, ITypeBinding typeBinding, String displayString,
- int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.typeBinding = typeBinding;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void addEdits(TextFileChange textChange) throws CoreException {
- CompilationUnit astRoot = invocationContext.getASTRoot();
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- ASTNode typeDeclaration = astRoot.findDeclaringNode(typeBinding);
-
- MethodDeclaration methodDeclaration = ast.newMethodDeclaration();
-
- SimpleName newNameNode = ast.newSimpleName(typeBinding.getName());
-
- methodDeclaration.setConstructor(true);
-
- methodDeclaration.modifiers().addAll(ast.newModifiers(Modifier.PUBLIC));
-
- methodDeclaration.setName(newNameNode);
-
- Block body = ast.newBlock();
-
- String placeHolder = CodeGeneration.getMethodBodyContent(invocationContext.getCompilationUnit(),
- typeBinding.getName(), newNameNode.getIdentifier(), true, "", String.valueOf('\n'));
- if (placeHolder != null) {
- ASTNode todoNode = rewriter.createStringPlaceholder(placeHolder, ASTNode.RETURN_STATEMENT);
- body.statements().add(todoNode);
- }
- methodDeclaration.setBody(body);
-
- ChildListPropertyDescriptor property = ((AbstractTypeDeclaration) typeDeclaration).getBodyDeclarationsProperty();
- List<ASTNode> members = (List<ASTNode>) typeDeclaration.getStructuralProperty(property);
- ListIterator<ASTNode> membersIterator = members.listIterator();
- int insertAt = 0;
- while (membersIterator.hasPrevious()) {
- ASTNode astNode = (ASTNode) membersIterator.previous();
- if (astNode instanceof MethodDeclaration && ((MethodDeclaration) astNode).isConstructor()) {
- insertAt = membersIterator.previousIndex() + 1;
- }
- }
- ListRewrite listRewriter= rewriter.getListRewrite(typeDeclaration, property);
- listRewriter.insertAt(methodDeclaration, insertAt, null);
- textChange.addEdit(rewriter.rewriteAST());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveAnnotationCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveAnnotationCorrectionProposal.java
deleted file mode 100644
index 97162e8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveAnnotationCorrectionProposal.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class RemoveAnnotationCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private Class<? extends java.lang.annotation.Annotation> annotation;
- private ASTNode parentNode;
-
- public RemoveAnnotationCorrectionProposal(IInvocationContext invocationContext,
- Class<? extends java.lang.annotation.Annotation> annotation, ASTNode parentNode, String displayString,
- int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.annotation = annotation;
- this.parentNode = parentNode;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- ASTRewrite rewriter = ASTRewrite.create(parentNode.getAST());
-
- if (parentNode instanceof Annotation) {
- Annotation jdtDomAnnotation = (Annotation) parentNode;
- rewriter.remove(jdtDomAnnotation, null);
- }
-
- if (parentNode instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) parentNode;
- Annotation jdtDomAnnotation = AnnotationUtils.getAnnotation(methodDeclaration.resolveBinding().getJavaElement(), annotation);
- if (jdtDomAnnotation != null) {
- rewriter.remove(jdtDomAnnotation, null);
- }
- }
-
- if (parentNode.getParent() instanceof TypeDeclaration) {
- TypeDeclaration typeDeclaration = (TypeDeclaration) parentNode.getParent();
- Annotation jdtDomAnnotation = AnnotationUtils.getAnnotation(typeDeclaration.resolveBinding().getJavaElement(), annotation);
- if (jdtDomAnnotation != null) {
- rewriter.remove(jdtDomAnnotation, null);
- }
- }
-
- textChange.addEdit(rewriter.rewriteAST());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMemberValuePairCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMemberValuePairCorrectionProposal.java
deleted file mode 100644
index 6faec6a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMemberValuePairCorrectionProposal.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class RemoveMemberValuePairCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private MemberValuePair memberValuePair;
- private boolean removeAllOtherMVPs;
-
- public RemoveMemberValuePairCorrectionProposal(IInvocationContext invocationContext,
- MemberValuePair memberValuePair, boolean removeAllOtherMVPs, String displayString, int relevance,
- Image image) {
- super(invocationContext, displayString, relevance, image);
- this.memberValuePair = memberValuePair;
- this.removeAllOtherMVPs = removeAllOtherMVPs;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void addEdits(TextFileChange textChange) throws CoreException {
- if (memberValuePair.getParent() instanceof NormalAnnotation) {
- NormalAnnotation annotation = (NormalAnnotation) memberValuePair.getParent();
-
- ASTRewrite astRewrite = ASTRewrite.create(annotation.getAST());
- if (removeAllOtherMVPs) {
- List<MemberValuePair> memberValuePairs = annotation.values();
- for (MemberValuePair otherMemberValuePair : memberValuePairs) {
- if (!otherMemberValuePair.equals(memberValuePair)) {
- astRewrite.remove(otherMemberValuePair, null);
- }
- }
- } else {
- astRewrite.remove(memberValuePair, null);
- }
- textChange.addEdit(astRewrite.rewriteAST());
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMethodCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMethodCorrectionProposal.java
deleted file mode 100644
index caf8042..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMethodCorrectionProposal.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class RemoveMethodCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private SimpleName methodName;
-
- public RemoveMethodCorrectionProposal(IInvocationContext invocationContext, SimpleName methodName,
- String displayString, int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.methodName = methodName;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- IBinding binding = methodName.resolveBinding();
- CompilationUnit astRoot = invocationContext.getASTRoot();
- IMethodBinding methodBinding = ((IMethodBinding) binding).getMethodDeclaration();
- ASTNode declaration = astRoot.findDeclaringNode(methodBinding);
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
- rewriter.remove(declaration, null);
- textChange.addEdit(rewriter.rewriteAST());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeAttributeInitializer.java
deleted file mode 100644
index cc5a1f2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeAttributeInitializer.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.VALUE;
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.SOAPBinding;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-public class BindingTypeAttributeInitializer extends AnnotationAttributeInitializer {
-
- private static final String SOAPBinding_SOAP11HTTP_BINDING = "SOAPBinding.SOAP11HTTP_BINDING"; //$NON-NLS-1$
- private static final String SOAPBinding_SOAP12HTTP_BINDING = "SOAPBinding.SOAP12HTTP_BINDING"; //$NON-NLS-1$
- private static final String SOAPBinding_SOAP11HTTP_MTOM_BINDING = "SOAPBinding.SOAP11HTTP_MTOM_BINDING"; //$NON-NLS-1$
- private static final String SOAPBinding_SOAP12HTTP_MTOM_BINDING = "SOAPBinding.SOAP12HTTP_MTOM_BINDING"; //$NON-NLS-1$
- private static final String HTTPBinding_HTTP_BINDING = "HTTPBinding.HTTP_BINDING"; //$NON-NLS-1$
-
- private static final String SOAP_BINDING = "javax.xml.ws.soap.SOAPBinding"; //$NON-NLS-1$
- private static final String HTTP_BINDING = "javax.xml.ws.http.HTTPBinding"; //$NON-NLS-1$
-
- public BindingTypeAttributeInitializer() {
- JAXWSUIPlugin.getDefault().getImageRegistry().put(SOAP_BINDING,
- JAXWSUIPlugin.getImageDescriptor("icons/obj16/soapbinding_obj.gif").createImage()); //$NON-NLS-1$
- JAXWSUIPlugin.getDefault().getImageRegistry().put(HTTP_BINDING,
- JAXWSUIPlugin.getImageDescriptor("icons/obj16/httpbinding_obj.gif").createImage()); //$NON-NLS-1$
- }
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- MemberValuePair value = AnnotationsCore.createStringMemberValuePair(ast, VALUE, getDefault()); //$NON-NLS-1$
- memberValuePairs.add(value);
- }
- return memberValuePairs;
- }
-
- @Override
- public List<ICompletionProposal> getCompletionProposalsForSingleMemberAnnotation(IJavaElement javaElement,
- SingleMemberAnnotation singleMemberAnnotation) {
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- Expression expression = singleMemberAnnotation.getValue();
- if (expression != null) {
- addQualifiedNameBindingsCompletionProposals(completionProposals, expression);
- }
- }
- return completionProposals;
- }
-
- @Override
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType) javaElement;
- String memberValuePairName = memberValuePair.getName().getIdentifier();
- if (memberValuePairName.equals(VALUE)) { //$NON-NLS-1$
- String value = memberValuePair.getValue().toString();
- if (value.equals(MISSING_IDENTIFER) || value.charAt(0) != '\"') {
- Map<String, String> bindings = getShortNameBindingsMap();
- Iterator<Map.Entry<String, String>> bindingsIter = bindings.entrySet().iterator();
- while (bindingsIter.hasNext()) {
- Map.Entry<String, String> bindingEntry = bindingsIter.next();
- String proposal = bindingEntry.getKey();
- String fullyQualifiedTypeName = bindingEntry.getValue();
- int replacementOffset = memberValuePair.getValue().getStartPosition();
- int replacementLength = memberValuePair.getValue().getLength();
- Image image = JAXWSUIPlugin.getDefault().getImageRegistry().get(fullyQualifiedTypeName);
- completionProposals.add(new BindingTypeCompletionProposal(proposal, type.getCompilationUnit(),
- replacementOffset, replacementLength, image, new StyledString(proposal), 5,
- fullyQualifiedTypeName));
- }
- } else {
- addQualifiedNameBindingsCompletionProposals(completionProposals, memberValuePair.getValue());
- }
- }
- }
- return completionProposals;
- }
-
- private void addQualifiedNameBindingsCompletionProposals(List<ICompletionProposal> completionProposals, Expression value) {
- Map<String, String> bindings = getQualifiedNameBindingsMap();
- Iterator<Map.Entry<String, String>> bindingsIter = bindings.entrySet().iterator();
- while (bindingsIter.hasNext()) {
- Map.Entry<String, String> bindingEntry = bindingsIter.next();
- String proposal = bindingEntry.getKey();
- Image image = JAXWSUIPlugin.getDefault().getImageRegistry().get(bindingEntry.getValue());
- completionProposals.add(createCompletionProposal(proposal, value, image, getDisplayString(proposal)));
- }
- }
-
- public String getDefault() {
- return SOAPBinding.SOAP11HTTP_BINDING;
- }
-
- private String getDisplayString(String binding) {
- if (binding.equals(SOAPBinding.SOAP11HTTP_BINDING)) {
- return SOAPBinding_SOAP11HTTP_BINDING;
- }
- if (binding.equals(SOAPBinding.SOAP12HTTP_BINDING)) {
- return SOAPBinding_SOAP12HTTP_BINDING;
- }
- if (binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING)) {
- return SOAPBinding_SOAP11HTTP_MTOM_BINDING;
- }
- if (binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) {
- return SOAPBinding_SOAP12HTTP_MTOM_BINDING;
- }
- if (binding.equals(HTTPBinding.HTTP_BINDING)) {
- return HTTPBinding_HTTP_BINDING;
- }
- return binding;
- }
-
- private Map<String, String> getQualifiedNameBindingsMap() {
- Map<String, String> bindings = new HashMap<String, String>();
- bindings.put(SOAPBinding.SOAP11HTTP_BINDING, SOAPBinding.class.getCanonicalName());
- bindings.put(SOAPBinding.SOAP12HTTP_BINDING, SOAPBinding.class.getCanonicalName());
- bindings.put(SOAPBinding.SOAP11HTTP_MTOM_BINDING, SOAPBinding.class.getCanonicalName());
- bindings.put(SOAPBinding.SOAP12HTTP_MTOM_BINDING, SOAPBinding.class.getCanonicalName());
- bindings.put(HTTPBinding.HTTP_BINDING, HTTPBinding.class.getCanonicalName());
- return bindings;
- }
-
- private Map<String, String> getShortNameBindingsMap() {
- Map<String, String> bindings = new HashMap<String, String>();
- bindings.put("SOAPBinding.SOAP11HTTP_BINDING", SOAPBinding.class.getCanonicalName());
- bindings.put("SOAPBinding.SOAP12HTTP_BINDING", SOAPBinding.class.getCanonicalName());
- bindings.put("SOAPBinding.SOAP11HTTP_MTOM_BINDING", SOAPBinding.class.getCanonicalName());
- bindings.put("SOAPBinding.SOAP12HTTP_MTOM_BINDING", SOAPBinding.class.getCanonicalName());
- bindings.put("HTTPBinding.HTTP_BINDING", HTTPBinding.class.getCanonicalName());
- return bindings;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeCompletionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeCompletionProposal.java
deleted file mode 100644
index 67ff087..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeCompletionProposal.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.internal.ui.text.java.JavaTypeCompletionProposal;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.swt.graphics.Image;
-
-@SuppressWarnings("restriction")
-public class BindingTypeCompletionProposal extends JavaTypeCompletionProposal {
-
- private final String replacementString;
- private final String fullyQualifiedTypeName;
-
- public BindingTypeCompletionProposal(String replacementString, ICompilationUnit compilationUnit,
- int replacementOffset, int replacementLength, Image image, StyledString displayString,
- int relevance, String fullyQualifiedTypeName) {
- super(replacementString, compilationUnit, replacementOffset, replacementLength, image, displayString,
- relevance, fullyQualifiedTypeName);
- this.fullyQualifiedTypeName = fullyQualifiedTypeName;
- this.replacementString = replacementString;
- }
-
- @Override
- protected boolean updateReplacementString(IDocument document, char trigger, int offset,
- ImportRewrite importRewrite) throws CoreException, BadLocationException {
-
- if (importRewrite != null && fullyQualifiedTypeName != null && replacementString != null) {
- if (fullyQualifiedTypeName.indexOf('.') != -1) {
- IType[] types= importRewrite.getCompilationUnit().getTypes();
- if (types.length > 0 && types[0].getSourceRange().getOffset() <= offset) {
- boolean importAdded = !importRewrite.addImport(fullyQualifiedTypeName).equals(fullyQualifiedTypeName);
- if (!importAdded) {
- setReplacementString(fullyQualifiedTypeName
- + replacementString.substring(replacementString.lastIndexOf('.')));
- }
- return importAdded;
- }
- }
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/RequestWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/RequestWrapperAttributeInitializer.java
deleted file mode 100644
index 77f6d70..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/RequestWrapperAttributeInitializer.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.CLASS_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.DOT_CHARACTER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.JAXWS_SUBPACKAGE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.LOCAL_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class RequestWrapperAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- MemberValuePair classNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, CLASS_NAME,
- getClassName(type, method));
-
- MemberValuePair localNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, LOCAL_NAME,
- getLocalName(type, method));
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- TARGET_NAMESPACE, getTargetNamespace(type));
-
- memberValuePairs.add(classNameValuePair);
- memberValuePairs.add(localNameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>(1);
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(CLASS_NAME)) {
- completionProposals.add(createCompletionProposal(getClassName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(LOCAL_NAME)) {
- completionProposals.add(createCompletionProposal(getLocalName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(type),
- memberValuePair.getValue()));
- }
- }
- return completionProposals;
- }
-
- protected String getPackageName(IType type) {
- StringBuilder packageName = new StringBuilder(type.getPackageFragment().getElementName());
- if (packageName.length() > 0) {
- packageName.append(DOT_CHARACTER);
- }
- packageName.append(JAXWS_SUBPACKAGE);
- packageName.append(DOT_CHARACTER);
- return packageName.toString();
- }
-
- protected String getClassName(IType type, IMethod method) {
- try {
- String methodName = method.getElementName();
- return getPackageName(type) + methodName.substring(0, 1).toUpperCase()
- + methodName.substring(1) + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- protected String getLocalName(IType type, IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebMethod.class, method);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- }
- return method.getElementName() + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- protected String getTargetNamespace(IType type) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebService.class, type);
- if (annotation != null) {
- String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
- if (targetNamespace != null && targetNamespace.length() > 0) {
- return targetNamespace;
- }
- }
- return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java
deleted file mode 100644
index b700378..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE_SUFFIX;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class ResponseWrapperAttributeInitializer extends RequestWrapperAttributeInitializer {
-
- @Override
- protected String getClassName(IType type, IMethod method) {
- try {
- String methodName = method.getElementName() + RESPONSE_SUFFIX;
- return getPackageName(type) + methodName.substring(0, 1).toUpperCase()
- + methodName.substring(1) + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- protected String getLocalName(IType type, IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebMethod.class, method);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName + RESPONSE_SUFFIX;
- }
- }
- return method.getElementName() + RESPONSE_SUFFIX
- + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java
deleted file mode 100644
index dd1124f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PARAMETER_STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.USE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-
-public class SOAPBindingAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), STYLE, Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), USE, Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), PARAMETER_STYLE, ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
- return memberValuePairs;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebMethodAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebMethodAttributeInitializer.java
deleted file mode 100644
index 7d1ea92..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebMethodAttributeInitializer.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ACTION;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class WebMethodAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- OPERATION_NAME, getOperationNameValue(type, method));
-
- MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- ACTION, getActionValue(type, method));
-
- memberValuePairs.add(operationValuePair);
- memberValuePairs.add(actionValuePair);
-
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(OPERATION_NAME)) {
- completionProposals.add(createCompletionProposal(getOperationNameValue(type, method),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(ACTION)) {
- completionProposals.add(createCompletionProposal(getActionValue(type, method),
- memberValuePair.getValue()));
- }
-
- }
- return completionProposals;
- }
-
- private String getOperationNameValue(IType type, IMethod method) {
- try {
- return method.getElementName() + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getActionValue(IType type, IMethod method) {
- try {
- String methodName = method.getElementName();
- return "urn:" + methodName.substring(0, 1).toUpperCase() //$NON-NLS-1$
- + methodName.substring(1) + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java
deleted file mode 100644
index c6916bc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ARG;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PART_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class WebParamAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement,
- AST ast, Class<? extends Annotation> annotationClass) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- if (javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- ILocalVariable parameter = (ILocalVariable) javaElement;
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(parameter));
- memberValuePairs.add(nameValuePair);
- }
- return memberValuePairs;
- }
-
- @Override
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- ILocalVariable parameter = (ILocalVariable) javaElement;
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(createCompletionProposal(getName(parameter),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(PART_NAME)) {
- completionProposals.add(createCompletionProposal(getPartName(parameter),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(parameter),
- memberValuePair.getValue()));
- }
-
- }
- return completionProposals;
- }
-
- private String getName(ILocalVariable parameter) {
- IMethod method = (IMethod) parameter.getParent();
- if (hasDocumentBareSOAPBinding(method)) {
- return getWebMethodOperationName(method);
- }
- try {
- List<String> methodNames = Arrays.asList(method.getParameterNames());
- return ARG + methodNames.indexOf(parameter.getElementName());
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return parameter.getElementName();
- }
-
- private String getPartName(ILocalVariable parameter) {
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(parameter,
- WebParam.class);
- if (annotation != null) {
- String name = AnnotationUtils.getStringValue(annotation, NAME);
- if (name != null) {
- return name;
- }
- }
- return getName(parameter);
- }
-
- private String getTargetNamespace(ILocalVariable parameter) {
- if (hasDocumentWrappedSOAPBinding(parameter) && !isHeader(parameter)) {
- return ""; //$NON-NLS-1$
- }
- return getDefaultTargetNamespace(parameter);
- }
-
- private String getDefaultTargetNamespace(ILocalVariable parameter) {
- IMethod method = (IMethod) parameter.getParent();
- IType type = method.getDeclaringType();
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(type,
- WebService.class);
- if (annotation != null) {
- String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
- if (targetNamespace != null) {
- return targetNamespace;
- }
- }
- return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
- }
-
- private boolean isHeader(ILocalVariable parameter) {
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(parameter, WebParam.class);
- if (annotation != null) {
- Boolean header = AnnotationUtils.getBooleanValue(annotation, HEADER);
- if (header != null) {
- return header.booleanValue();
- }
- }
- return false;
- }
-
- private boolean hasDocumentWrappedSOAPBinding(ILocalVariable parameter) {
- IMethod method = (IMethod) parameter.getParent();
-
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(method,
- SOAPBinding.class);
- if (annotation != null) {
- return JAXWSUtils.isDocumentWrapped(annotation);
- }
-
- org.eclipse.jdt.core.dom.Annotation typeAnnotation = AnnotationUtils.getAnnotation(method.getDeclaringType(),
- SOAPBinding.class);
- if (typeAnnotation != null) {
- return JAXWSUtils.isDocumentWrapped(typeAnnotation);
- }
- return true;
- }
-
- private boolean hasDocumentBareSOAPBinding(IJavaElement javaElement) {
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(javaElement,
- SOAPBinding.class);
- if (annotation != null) {
- return JAXWSUtils.isDocumentBare(annotation);
- }
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- return hasDocumentBareSOAPBinding(method.getDeclaringType());
- }
- return false;
- }
-
-
- private String getWebMethodOperationName(IMethod method) {
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(method,
- WebMethod.class);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- }
- return method.getElementName();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebResultAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebResultAttributeInitializer.java
deleted file mode 100644
index bdf5964..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebResultAttributeInitializer.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PART_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RETURN;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.jdt.core.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class WebResultAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(method));
-
- memberValuePairs.add(nameValuePair);
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(createCompletionProposal(getName(method), memberValuePair
- .getValue()));
- }
-
- if (memberValuePairName.equals(PART_NAME)) {
- completionProposals.add(createCompletionProposal(getPartName(method),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(method),
- memberValuePair.getValue()));
- }
-
- }
- return completionProposals;
- }
-
- private String getName(IMethod method) {
- if (hasDocumentBareSOAPBinding(method)) {
- return getOperationName(method) + RESPONSE;
- }
- return RETURN;
- }
-
- private String getOperationName(IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebMethod.class, method);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return method.getElementName();
- }
-
- private boolean hasDocumentBareSOAPBinding(IAnnotatable annotatable) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(SOAPBinding.class, annotatable);
- if (annotation != null) {
- return JAXWSUtils.isDocumentBare(annotation);
- }
- if (annotatable instanceof IMethod) {
- IMethod method = (IMethod) annotatable;
- return hasDocumentBareSOAPBinding((IType) method.getParent());
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return false;
- }
-
- private String getPartName(IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebResult.class, method);
- if (annotation != null) {
- String name = AnnotationUtils.getStringValue(annotation, NAME);
- if (name != null) {
- return name;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return getName(method);
- }
-
- private String getTargetNamespace(IMethod method) {
- if (hasDocumentWrappedSOAPBinding(method) && !isHeader(method)) {
- return ""; //$NON-NLS-1$
- }
- return getDefaultTargetNamespace(method);
- }
-
- private boolean hasDocumentWrappedSOAPBinding(IAnnotatable annotatable) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(SOAPBinding.class, annotatable);
- if (annotation != null) {
- return JAXWSUtils.isDocumentWrapped(annotation);
- }
- if (annotatable instanceof IMethod) {
- IMethod method = (IMethod) annotatable;
- return hasDocumentWrappedSOAPBinding((IType) method.getParent());
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return true;
- }
-
- private boolean isHeader(IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebResult.class, method);
- if (annotation != null) {
- Boolean header = AnnotationUtils.getBooleanValue(annotation, HEADER);
- if (header != null) {
- return header.booleanValue();
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return false;
- }
-
- private String getDefaultTargetNamespace(IMethod method) {
- IType type = method.getDeclaringType();
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebService.class, type);
- if (annotation != null) {
- String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
- if (targetNamespace != null) {
- return targetNamespace;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
-
- return JDTUtils.getTargetNamespaceFromPackageName(getPackageName(type));
- }
-
- private String getPackageName(IType type) {
- IPackageFragment packageFragment = type.getPackageFragment();
- return packageFragment.getElementName();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebServiceAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebServiceAttributeInitializer.java
deleted file mode 100644
index 1163586..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebServiceAttributeInitializer.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ENDPOINT_INTERFACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class WebServiceAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- try {
- IType type = (IType)javaElement;
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(type));
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, PORT_NAME,
- getPortName(type));
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, SERVICE_NAME,
- getServiceName(type));
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- TARGET_NAMESPACE, getTargetNamespace(type));
-
- if (type.isInterface()) {
- memberValuePairs.add(nameValuePair);
- }
-
- memberValuePairs.add(targetNamespaceValuePair);
-
- if (type.isClass()) {
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType) javaElement;
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(ENDPOINT_INTERFACE)) {
- List<String> interfaces = getInterfaces(type);
- for (String anInterface : interfaces) {
- completionProposals.add(createCompletionProposal(anInterface,
- memberValuePair.getValue(), JavaUI.getSharedImages().getImage(
- ISharedImages.IMG_OBJS_INTERFACE), anInterface));
- }
- }
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(createCompletionProposal(getName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(PORT_NAME)) {
- completionProposals.add(createCompletionProposal(getPortName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(SERVICE_NAME)) {
- completionProposals.add(createCompletionProposal(getServiceName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(type),
- memberValuePair.getValue()));
- }
- }
- return completionProposals;
- }
-
- public String getName(IType type) {
- return type.getElementName();
- }
-
- public String getPortName(IType type) {
- return type.getElementName() + PORT_SUFFIX;
- }
-
- public String getServiceName(IType type) {
- return type.getElementName() + SERVICE_SUFFIX;
- }
-
- public String getTargetNamespace(IType type) {
- return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
- }
-
- private List<String> getInterfaces(IType type) {
- try {
- List<String> interfaces = new ArrayList<String>();
- ITypeHierarchy typeHierarchy = type.newTypeHierarchy(type.getJavaProject(), null);
- IType[] allInterfaces = typeHierarchy.getAllInterfaces();
- for (IType aInterface : allInterfaces) {
- if (!aInterface.isBinary() && aInterface.getResource().getProject().equals(
- type.getResource().getProject())) {
- String packageName = aInterface.getPackageFragment().getElementName();
- if (packageName.trim().length() > 0) {
- packageName += "."; //$NON-NLS-1$
- }
- String qualifiedName = packageName + aInterface.getPrimaryElement().getElementName();
- interfaces.add(qualifiedName);
- }
- }
- return interfaces;
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Collections.emptyList();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/HandlerChainSelectionDialog.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/HandlerChainSelectionDialog.java
deleted file mode 100644
index 61922cb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/HandlerChainSelectionDialog.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.dialogs;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSHandlerUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-public class HandlerChainSelectionDialog extends ElementTreeSelectionDialog {
- private static final String XML_FILE_EXTENSION = "xml"; //$NON-NLS-1$
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- public HandlerChainSelectionDialog(Shell parent, ILabelProvider labelProvider, ITreeContentProvider contentProvider) {
- super(parent, labelProvider, contentProvider);
- setTitle(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_TITLE);
- setMessage(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_DESCRIPTION);
- setAllowMultiple(false);
- setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length > 0) {
- Object selected = selection[0];
- if (selected instanceof IFile) {
- IFile file = (IFile) selected;
- try {
- if (file.getFileExtension().equals(XML_FILE_EXTENSION) &&
- JAXWSHandlerUtils.isHandlerChainFile(file)) {
- return ok_status;
- }
- } catch (IOException ioe) {
- JAXWSUIPlugin.log(ioe);
- }
- }
- }
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_INVALID);
- }
- });
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/NewHandlerChainDialog.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/NewHandlerChainDialog.java
deleted file mode 100644
index bcc0590..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/NewHandlerChainDialog.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.dialogs;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-public class NewHandlerChainDialog extends ElementTreeSelectionDialog implements ISelectionStatusValidator {
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private String handlerChainFileName = "handler-chain.xml"; //$NON-NLS-1$
-
- public NewHandlerChainDialog(Shell parent, ILabelProvider labelProvider,
- ITreeContentProvider contentProvider) {
- super(parent, labelProvider, contentProvider);
- setTitle(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_TITLE);
- setMessage(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_DESCRIPTION);
- setAllowMultiple(false);
- setValidator(this);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite fileComposite = new Composite(composite, SWT.NONE);
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- fileComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- fileComposite.setLayoutData(gridData);
- Label handleChainLabel = new Label(fileComposite, SWT.NONE);
- handleChainLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_NAME);
- Text newHandlerChainText = new Text(fileComposite, SWT.BORDER);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- newHandlerChainText.setLayoutData(gridData);
- newHandlerChainText.setText(handlerChainFileName);
- newHandlerChainText.addKeyListener(new KeyAdapter() {
- @Override
- public void keyReleased(KeyEvent e) {
- super.keyReleased(e);
- handlerChainFileName = ((Text) e.widget).getText();
- updateOKStatus();
- }
-
- });
- updateOKStatus();
- return composite;
- }
-
- public IStatus validate(Object[] selection) {
- if (handlerChainFileName.trim().length() == 0) {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_ENTER_NAME);
- }
-
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus result = workspace.validateName(handlerChainFileName, IResource.FILE);
- if (!result.isOK()) {
- return result;
- }
-
- if (selection == null || selection.length == 0 || selection[0] instanceof IJavaProject) {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_CHOOSE_FOLDER);
- }
-
- if (!handlerChainFileName.endsWith(".xml")) { //$NON-NLS-1$
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IPath path = new Path(getFilePath());
- if (path.segmentCount() > 1) {
- if (path.lastSegment() != null && path.lastSegment().equals(".xml")) { //$NON-NLS-1$
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME);
- }
- }
- if (workspace.getRoot().getFile(path).exists()) {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS,
- handlerChainFileName));
- }
-
- return ok_status;
- }
-
- public String getFileName() {
- return handlerChainFileName;
- }
-
- public String getFilePath() {
- Object element = getFirstResult();
- if (element instanceof IJavaProject) {
- return ((IJavaProject) element).getProject().getFullPath().toOSString() + File.separatorChar
- + handlerChainFileName;
- }
-
- if (element instanceof IJavaElement) {
- return ((IJavaElement) element).getResource().getFullPath().toOSString() + File.separatorChar
- + handlerChainFileName;
- }
- if (element instanceof IResource) {
- return ((IResource) element).getFullPath().toOSString() + File.separatorChar + handlerChainFileName;
- }
- return handlerChainFileName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/filters/NewHandlerChainViewerFilter.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/filters/NewHandlerChainViewerFilter.java
deleted file mode 100644
index be855ae..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/filters/NewHandlerChainViewerFilter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.filters;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class NewHandlerChainViewerFilter extends ViewerFilter {
- private static final String XML_FILE_EXTENSION = "xml"; //$NON-NLS-1$
-
- private IJavaProject javaProject;
- private boolean filterFiles;
- private boolean filterCompilationUnits;
-
- public NewHandlerChainViewerFilter(IJavaProject javaProject, boolean filterFiles, boolean filterCompilationUnits) {
- this.javaProject = javaProject;
- this.filterFiles = filterFiles;
- this.filterCompilationUnits = filterCompilationUnits;
- }
-
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- try {
- if (element instanceof IJavaProject) {
- if (javaProject != null) {
- return javaProject.equals(element);
- }
- return false;
-
- }
- if (element instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
- return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
- }
- if (element instanceof IPackageFragment) {
- return true;
- }
-
- if (!filterFiles && element instanceof IFile) {
- IFile file = (IFile) element;
- return file.isAccessible() && file.getFileExtension().equals(XML_FILE_EXTENSION);
- }
-
- if (!filterCompilationUnits && element instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType type = compilationUnit.findPrimaryType();
- return type.isClass() || type.isInterface() && !type.isAnnotation();
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme);
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/handlers/ConfigureHandlerChainHandler.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/handlers/ConfigureHandlerChainHandler.java
deleted file mode 100644
index 990692f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/handlers/ConfigureHandlerChainHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.wizards.ConfigureHandlerWizard;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-public class ConfigureHandlerChainHandler extends AbstractHandler {
-
- public Object execute(ExecutionEvent event) throws ExecutionException {
- ISelection selection = HandlerUtil.getCurrentSelection(event);
- if (selection != null && selection instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- if (structuredSelection.getFirstElement() != null) {
- Object element = structuredSelection.getFirstElement();
- try {
- IType type = null;
- if (element instanceof IWebService) {
- IWebService webService = (IWebService) element;
- type = Dom2ResourceMapper.INSTANCE.findType(webService);
- }
- if (element instanceof IServiceEndpointInterface) {
- IServiceEndpointInterface serviceEndpointInterface = (IServiceEndpointInterface) element;
- type = Dom2ResourceMapper.INSTANCE.findType(serviceEndpointInterface);
- }
- if (type != null) {
- ConfigureHandlerWizard configureHandlerWizard = new ConfigureHandlerWizard(type);
- Shell shell = HandlerUtil.getActiveShell(event);
- WizardDialog dialog = new WizardDialog(shell, configureHandlerWizard);
- dialog.create();
- dialog.open();
- }
-
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java
deleted file mode 100644
index 45e1332..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-
-public class AnnotationArrayCellEditor extends DialogCellEditor {
- private Method method;
- private Object[] values;
-
- private List<Object> originalValues;
- private List<Object> updatedValues;
-
- private AnnotationArrayDialog annotationArrayDialog;
-
- boolean cancelled;
-
- public AnnotationArrayCellEditor(Composite parent, Object[] values) {
- super(parent, SWT.NONE);
- this.values = values.clone();
- }
-
- @Override
- protected Object openDialogBox(Control cellEditorWindow) {
- annotationArrayDialog = new AnnotationArrayDialog(cellEditorWindow.getShell(), values);
- int returnValue = annotationArrayDialog.open();
-
- if (returnValue == Window.OK) {
- cancelled = false;
- return annotationArrayDialog.getResult();
- } if (returnValue == Window.CANCEL) {
- cancelled = true;
- }
- return values;
- }
-
- public void setMethod(Method method) {
- this.method = method;
- if (updatedValues != null) {
- updatedValues.clear();
- }
- }
-
- @Override
- protected void updateContents(Object value) {
- if (value instanceof Object[]) {
- Object[] values = (Object[])value;
- if (values.length > 0) {
- getDefaultLabel().setText("[]{...}"); //$NON-NLS-1$
- } else {
- getDefaultLabel().setText("[]{}"); //$NON-NLS-1$
- }
- }
- }
-
- @Override
- protected Object doGetValue() {
- if (cancelled || updatedValues == null) {
- return originalValues != null ? originalValues.toArray() : new Object[0];
- }
- return updatedValues.toArray();
- }
-
- @Override
- protected void doSetValue(Object value) {
- super.doSetValue(value);
- this.values = (Object[])value;
- }
-
- private class AnnotationArrayDialog extends SelectionStatusDialog {
- private Button addButton;
- private Button removeButton;
- private Button upButton;
- private Button downButton;
- private Table arrayValuesTable;
- private TableViewer arrayValuesTableViewer;
-
- private Map<String, Control> controls = new HashMap<String, Control>();
-
- public AnnotationArrayDialog(Shell parent, Object[] values) {
- super(parent);
- setValues(values);
- setTitle(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE);
- }
-
- private void setValues(Object[] values) {
- try {
- originalValues = new ArrayList<Object>();
- updatedValues = new ArrayList<Object>();
- for (Object value : values) {
- if (value instanceof IAnnotation) {
- IAnnotation annotation = (IAnnotation) value;
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- if (memberValuePairs.length > 0) {
- List<Map<String, Object>> aList = new ArrayList<Map<String,Object>>();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- String memberName = memberValuePair.getMemberName();
- Object memberValue = memberValuePair.getValue();
- Map<String, Object> mvps = new HashMap<String, Object>();
- if (memberValuePair.getValueKind() == IMemberValuePair.K_STRING) {
- mvps.put(memberName, memberValue);
- }
-
- if (memberValuePair.getValueKind() == IMemberValuePair.K_CLASS) {
- mvps.put(memberName, memberValuePair.getValue() + ".class"); //$NON-NLS-1$
- }
- aList.add(mvps);
- }
- originalValues.add(aList);
- updatedValues.add(aList);
- }
- }
- if (value.equals(Class.class)) {
- originalValues.add(value);
- updatedValues.add(value);
- }
- if (value instanceof String) {
- String string = (String)value;
- originalValues.add(string);
- updatedValues.add(string);
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite mainComposite = (Composite) super.createDialogArea(parent);
-
- GridLayout gridLayout = new GridLayout(3, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.BEGINNING, false, false);
- gridData.widthHint = 800;
- mainComposite.setLayoutData(gridData);
-
- Composite typeComposite = new Composite(mainComposite, SWT.NONE);
- gridLayout = new GridLayout(3, false);
- typeComposite.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, true);
- typeComposite.setLayoutData(gridData);
-
- final Class<?> componentType = method.getReturnType().getComponentType();
- if (componentType.isAnnotation()) {
- Label compontTypeLabel = new Label(typeComposite, SWT.NONE);
- compontTypeLabel.setText("@" + componentType.getName()); //$NON-NLS-1$
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- compontTypeLabel.setLayoutData(gridData);
-
- Method[] methods = componentType.getDeclaredMethods();
- for (Method method : methods) {
- Label label = new Label(typeComposite, SWT.NONE);
- label.setText(method.getName() + ":"); //$NON-NLS-1$
- createEntryFields(method, typeComposite);
- }
- } else {
- Label label = new Label(typeComposite, SWT.NONE);
- label.setText(method.getReturnType().getSimpleName());
- createEntryFields(method, typeComposite);
- }
-
- Composite buttonComposite = new Composite(mainComposite, SWT.NONE);
- gridLayout = new GridLayout(1, false);
- buttonComposite.setLayout(gridLayout);
-
- addButton = new Button(buttonComposite, SWT.PUSH);
- addButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_ADD_LABEL);
- addButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- Set<Entry<String, Control>> entrySet = controls.entrySet();
- Iterator<Map.Entry<String, Control>> iterator = entrySet.iterator();
- List<Map<String, Object>> aList = new ArrayList<Map<String,Object>>();
- while (iterator.hasNext()) {
- Map.Entry<String, Control> entry = iterator.next();
- if (entry.getValue() instanceof Text) {
- Text textField = (Text) entry.getValue();
- Method method = (Method) textField.getData();
- if (textField.getText().trim().length() > 0) {
- if (componentType.isAnnotation()) {
- Map<String, Object> memberValuePairs = new HashMap<String, Object>();
- memberValuePairs.put(method.getName(), textField.getText());
- aList.add(memberValuePairs);
- } else {
- updatedValues.add(textField.getText());
- }
- }
- }
- if (entry.getValue() instanceof Button) {
- Button button = (Button) entry.getValue();
- Method method = (Method) button.getData();
- if (componentType.isAnnotation()) {
- Map<String, Object> memberValuePairs = new HashMap<String, Object>();
- memberValuePairs.put(method.getName(), button.getSelection());
- aList.add(memberValuePairs);
- } else {
- updatedValues.add(button.getSelection());
- }
- }
-
- }
- if (aList.size() > 0) {
- updatedValues.add(aList);
- }
- arrayValuesTableViewer.refresh();
- }
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- addButton.setLayoutData(gridData);
-
- removeButton = new Button(buttonComposite, SWT.PUSH);
- removeButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL);
- removeButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- ISelection selection = arrayValuesTableViewer.getSelection();
- if (selection != null && !selection.isEmpty()) {
- int index = arrayValuesTable.getSelectionIndex();
- updatedValues.remove(index);
- arrayValuesTableViewer.refresh();
- }
- }
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- removeButton.setLayoutData(gridData);
-
- upButton = new Button(buttonComposite, SWT.PUSH);
- upButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL);
- upButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- moveSelectedElememtUp(getSelectedElement(), getTableViewer());
- }
- });
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- upButton.setLayoutData(gridData);
-
- downButton = new Button(buttonComposite, SWT.PUSH);
- downButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL);
- downButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- moveSelectedElememtDown(getSelectedElement(), getTableViewer());
- }
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- downButton.setLayoutData(gridData);
-
- Composite valuesComposite = new Composite(mainComposite, SWT.NONE);
- gridLayout = new GridLayout(1, false);
- valuesComposite.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.widthHint = 200;
- valuesComposite.setLayoutData(gridData);
-
- Label valuesLabel = new Label(valuesComposite, SWT.NONE);
- valuesLabel.setText(method.getName() + ":"); //$NON-NLS-1$
-
- arrayValuesTableViewer = new TableViewer(valuesComposite, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL
- | SWT.H_SCROLL);
- arrayValuesTableViewer.setLabelProvider(new LabelProvider() {
- @Override
- public String getText(Object element) {
- if (element instanceof List<?>) {
- String annotationName = method.getReturnType().getComponentType().getSimpleName();
- annotationName += "("; //$NON-NLS-1$
- List<Map<String, Object>> valuesList = (List<Map<String, Object>>)element;
- Iterator<Map<String, Object>> valuesIterator = valuesList.iterator();
- while (valuesIterator.hasNext()) {
- Map<String, Object> valuesMap = valuesIterator.next();
- Set<Entry<String, Object>> entrySet = valuesMap.entrySet();
- Iterator<Map.Entry<String, Object>> iterator = entrySet.iterator();
- while (iterator.hasNext()) {
- Map.Entry<String, Object> entry = iterator.next();
- Object value = entry.getValue();
- boolean isString = value instanceof String && !value.toString().
- endsWith(".class"); //$NON-NLS-1$
- if (isString) {
- annotationName += entry.getKey() + "=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- annotationName += entry.getKey() + "=" + value; //$NON-NLS-1$
- }
- }
- if (valuesIterator.hasNext()) {
- annotationName += ", "; //$NON-NLS-1$
- }
- }
- return annotationName += ")"; //$NON-NLS-1$
- }
- return element.toString();
- }
-
- @Override
- public Image getImage(Object element) {
- Class<?> returnType = method.getReturnType();
- if (returnType.getComponentType().isAnnotation()) {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_ANNOTATION);
- } if (returnType.equals(Class.class)) {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
- } else {
- return PlatformUI.getWorkbench().getSharedImages().getImage(
- org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
- }
- }
- });
-
- arrayValuesTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- int index = arrayValuesTable.getSelectionIndex();
- int itemCount = arrayValuesTable.getItemCount();
-
- if (index == 0 && itemCount <= 1) {
- upButton.setEnabled(false);
- downButton.setEnabled(false);
- }
-
- if (index == 0 && itemCount > 1) {
- upButton.setEnabled(false);
- downButton.setEnabled(true);
- }
-
- if (index > 0 && index < itemCount - 1) {
- upButton.setEnabled(true);
- downButton.setEnabled(true);
- }
-
- if (index > 0 && index == itemCount - 1) {
- upButton.setEnabled(true);
- downButton.setEnabled(false);
- }
-
- if (index != -1) {
- removeButton.setEnabled(true);
- } else {
- removeButton.setEnabled(false);
- }
- }
- });
-
- arrayValuesTableViewer.setContentProvider(new ArrayValuesContentProvider());
-
- arrayValuesTable = arrayValuesTableViewer.getTable();
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- arrayValuesTable.setLayoutData(gridData);
-
- arrayValuesTableViewer.setInput(values);
-
- upButton.setEnabled(false);
- downButton.setEnabled(false);
- removeButton.setEnabled(false);
-
- return mainComposite;
- }
-
- public void createEntryFields(Method method, Composite typeComposite) {
- //TODO Handle ENUMS
- Class<?> returnType = method.getReturnType();
- Object defaultValue = method.getDefaultValue();
- GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- //String or String[]
- if (returnType.equals(String.class) || returnType.isArray() && returnType.getComponentType().equals(String.class)) {
- Text text = new Text(typeComposite, SWT.BORDER);
- text.setData(method);
- gridData.horizontalSpan = 2;
- text.setLayoutData(gridData);
- if (defaultValue != null) {
- if (defaultValue instanceof String[] && ((String[]) defaultValue).length == 1) {
- String[] values = (String[]) defaultValue;
- text.setText(values[0]);
- } else {
- text.setText(defaultValue.toString());
- }
- }
- controls.put(method.getName(), text);
- }
- //Class or Class[]
- if (returnType.equals(Class.class) || returnType.isArray() && returnType.getComponentType().equals(Class.class)) {
- final Text text = new Text(typeComposite, SWT.BORDER);
- text.setData(method);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- text.setLayoutData(gridData);
- if (defaultValue != null) {
- Class<?> classValue = (Class<?>)defaultValue;
- text.setText(classValue.getCanonicalName() + ".class"); //$NON-NLS-1$
- }
- Button browseClassButton = new Button(typeComposite, SWT.PUSH);
- browseClassButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL);
- browseClassButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- SelectionDialog dialog = getClassSelectionDialog();
- dialog.setTitle(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE);
- if (dialog.open() == IDialogConstants.OK_ID) {
- Object[] types = dialog.getResult();
-
- if (types != null && types.length > 0) {
- IType type = (IType)types[0];
- if (type.isBinary()) {
- text.setText(type.getClassFile().getElementName());
- }
- }
- }
- }
- });
- controls.put(method.getName(), text);
- }
-
- //Boolean
- if (returnType.equals(Boolean.TYPE)) {
- Button checkbox = new Button(typeComposite, SWT.CHECK);
- checkbox.setData(method);
- gridData.horizontalSpan = 2;
- checkbox.setLayoutData(gridData);
- if (defaultValue != null) {
- checkbox.setSelection((Boolean)defaultValue);
- }
- controls.put(method.getName(), checkbox);
- }
- }
-
- public Object getSelectedElement() {
- IStructuredSelection selection= (IStructuredSelection) arrayValuesTableViewer.getSelection();
- return selection.getFirstElement();
- }
-
- private TableViewer getTableViewer() {
- return arrayValuesTableViewer;
- }
-
- public void moveSelectedElememtUp(Object selected, TableViewer tableViewer) {
- int selectionIndex = tableViewer.getTable().getSelectionIndex();
- if (selectionIndex > 0) {
- updatedValues.remove(selected);
- updatedValues.add(selectionIndex - 1, selected);
-
- tableViewer.refresh();
- tableViewer.reveal(selected);
- tableViewer.setSelection(new StructuredSelection(selected));
- }
- }
-
- public void moveSelectedElememtDown(Object selected, TableViewer tableViewer) {
- int selectionIndex = tableViewer.getTable().getSelectionIndex();
- int itemCount = tableViewer.getTable().getItemCount();
- if (selectionIndex < itemCount - 1) {
- updatedValues.remove(selected);
- updatedValues.add(selectionIndex + 1, selected);
-
- tableViewer.refresh();
- tableViewer.reveal(selected);
- tableViewer.setSelection(new StructuredSelection(selected));
- }
- }
-
- private class ArrayValuesContentProvider implements IStructuredContentProvider {
-
- public ArrayValuesContentProvider() {
- }
-
- public Object[] getElements(Object inputElement) {
- return updatedValues.toArray();
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- public SelectionDialog getClassSelectionDialog() {
- try {
- return JavaUI.createTypeDialog(getShell(), PlatformUI.getWorkbench().getProgressService(),
- SearchEngine.createWorkspaceScope(), IJavaElementSearchConstants.CONSIDER_CLASSES,
- false, "* "); //$NON-NLS-1$
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return null;
- }
-
-
- @Override
- public Object[] getResult() {
- return updatedValues.toArray();
- }
-
- @Override
- protected void computeResult() {
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java
deleted file mode 100755
index c75726a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-public class AnnotationsColumnLabelProvider extends ColumnLabelProvider {
-
- @Override
- public String getText(Object element) {
- if (element instanceof Class) {
- return ((Class<?>)element).getName();
- }
-
- if (element instanceof Method) {
- return ((Method)element).getName();
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof Class) {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_ANNOTATION);
- }
- if (element instanceof Method) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(
- org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java
deleted file mode 100644
index facea9c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-public class AnnotationsValuesColumnLabelProvider extends ColumnLabelProvider {
- private TreeViewer annotationTreeViewer;
- private Image true_image;
- private Image false_image;
-
- public AnnotationsValuesColumnLabelProvider(TreeViewer annotationTreeViewer) {
- this.annotationTreeViewer = annotationTreeViewer;
- true_image = JAXWSUIPlugin.imageDescriptorFromPlugin(JAXWSUIPlugin.PLUGIN_ID, "icons/obj16/true.gif") //$NON-NLS-1$
- .createImage();
- false_image = JAXWSUIPlugin.imageDescriptorFromPlugin(JAXWSUIPlugin.PLUGIN_ID, "icons/obj16/false.gif") //$NON-NLS-1$
- .createImage();
- }
-
- @Override
- public String getText(Object element) {
- if (element instanceof Method) {
- return getTextForMethod((Method)element);
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getTextForMethod(Method method) {
- if (annotationTreeViewer.getInput() instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) annotationTreeViewer.getInput();
- if (javaElement.exists()) {
- return getTextForMethod(method, javaElement);
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getTextForMethod(Method method, IJavaElement annotatedElement) {
- List<Annotation> annotations = AnnotationUtils.getAnnotations(annotatedElement);
- for (Annotation annotation : annotations) {
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- Class<?> declaringClass = method.getDeclaringClass();
- if (annotationName.equals(declaringClass.getSimpleName())
- || annotationName.equals(declaringClass.getCanonicalName())) {
- if (annotation.isNormalAnnotation()) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- @SuppressWarnings("unchecked")
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(method.getName())) {
- return getTextForMethod(method.getReturnType(), memberValuePair.getValue());
- }
- }
- } else if (annotation.isSingleMemberAnnotation()) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- return getTextForMethod(method.getReturnType(), singleMemberAnnotation.getValue());
- }
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getTextForMethod(Class<?> returnType, Expression expression) {
- if (returnType.equals(String.class)) {
- return expression.toString();
- }
-
- if (returnType.equals(Class.class)) {
- return expression.toString() + ".class"; //$NON-NLS-1$
- }
- if (returnType.isPrimitive() && (returnType.equals(Byte.TYPE)
- || returnType.equals(Short.TYPE) || returnType.equals(Integer.TYPE)
- || returnType.equals(Long.TYPE) || returnType.equals(Float.TYPE)
- || returnType.equals(Double.TYPE))) {
- return expression.toString();
- }
-
- if (returnType.isArray() && expression instanceof ArrayInitializer) {
- ArrayInitializer arrayInitializer = (ArrayInitializer) expression;
- if (arrayInitializer.expressions().size() > 0) {
- return "[]{...}"; //$NON-NLS-1$
- } else {
- return "[]{}"; //$NON-NLS-1$
- }
- }
- if (returnType.isEnum()) {
- String enumValue = expression.toString();
- return enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- public Image getImage(Object element) {
- try {
- if (element instanceof Class) {
- return getImageForClass((Class<?>) element);
- }
- if (element instanceof Method) {
- return getImageForMethod((Method) element);
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return null;
- }
-
- private Image getImageForClass(Class<?> aClass) throws JavaModelException {
- if (annotationTreeViewer.getInput() instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) annotationTreeViewer.getInput();
- if (javaElement.exists()) {
- return getImageForClass(aClass, javaElement);
- }
- }
- return null;
- }
-
- private Image getImageForClass(Class<?> aClass, IJavaElement javaElement) throws JavaModelException {
- List<Annotation> annotations = AnnotationUtils.getAnnotations(javaElement);
- for (Annotation annotation : annotations) {
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- if (annotationName.equals(aClass.getSimpleName()) ||
- annotationName.equals(aClass.getCanonicalName())) {
- return true_image;
- }
- }
- return false_image;
- }
-
- private Image getImageForMethod(Method method) throws JavaModelException {
- if (method.getReturnType().equals(Boolean.TYPE) && annotationTreeViewer.getInput() instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) annotationTreeViewer.getInput();
- if (javaElement.exists()) {
- return getImageForMethod(method, javaElement);
- }
- }
- return null;
- }
-
- private Image getImageForMethod(Method method, IJavaElement javaElement) throws JavaModelException {
- List<Annotation> annotations = AnnotationUtils.getAnnotations(javaElement);
- for (Annotation annotation : annotations) {
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- Class<?> declaringClass = method.getDeclaringClass();
- if (annotationName.equals(declaringClass.getSimpleName())
- || annotationName.equals(declaringClass.getCanonicalName())) {
- if (annotation.isNormalAnnotation()) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- @SuppressWarnings("unchecked")
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(method.getName())
- && memberValuePair.getValue() instanceof BooleanLiteral) {
- if (((BooleanLiteral) memberValuePair.getValue()).booleanValue()) {
- return true_image;
- }
- }
- }
- } else if (annotation.isSingleMemberAnnotation()) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- if (singleMemberAnnotation.getValue() instanceof BooleanLiteral) {
- if (((BooleanLiteral) singleMemberAnnotation.getValue()).booleanValue()) {
- return true_image;
- }
- }
- }
- }
- }
- return false_image;
- }
-
- @Override
- public void dispose() {
- super.dispose();
- true_image.dispose();
- false_image.dispose();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java
deleted file mode 100644
index 2f7cb59..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public class AnnotationsValuesEditingSupport extends EditingSupport {
- private AnnotationsView annotationsView;
- private TreeViewer treeViewer;
-
- private TextCellEditor textCellEditor;
- private CheckboxCellEditor checkboxCellEditor;
- private ComboBoxCellEditor comboBoxCellEditor;
- private ClassDialogCellEditor classDialogCellEditor;
- private AnnotationArrayCellEditor annotationArrayCellEditor;
-
- public AnnotationsValuesEditingSupport(AnnotationsView annotationsView, TreeViewer treeViewer) {
- super(treeViewer);
- this.treeViewer = treeViewer;
- this.annotationsView = annotationsView;
- textCellEditor = new TextCellEditor(treeViewer.getTree());
- checkboxCellEditor = new CheckboxCellEditor(treeViewer.getTree());
- comboBoxCellEditor = new ComboBoxCellEditor(treeViewer.getTree(), new String[] {});
- classDialogCellEditor = new ClassDialogCellEditor(treeViewer.getTree());
- annotationArrayCellEditor = new AnnotationArrayCellEditor(treeViewer.getTree(), new Object[] {});
- }
-
- @Override
- protected boolean canEdit(Object element) {
- if (element instanceof Method) {
- Method method = (Method)element;
- return (Boolean) getValue(method.getDeclaringClass());
- }
- return true;
- }
-
- @Override
- protected CellEditor getCellEditor(Object element) {
- if (element instanceof Class) {
- return checkboxCellEditor;
- }
- if (element instanceof Method) {
- Method method = (Method) element;
- final Class<?> returnType = method.getReturnType();
- if (returnType.isEnum()) {
- Object[] enumConstants = returnType.getEnumConstants();
- String[] values = new String[enumConstants.length];
- for (int i = 0; i < enumConstants.length; i++) {
- values[i] = enumConstants[i].toString();
- }
- comboBoxCellEditor.setItems(values);
- return comboBoxCellEditor;
- }
- if (returnType.equals(Boolean.TYPE)) {
- return checkboxCellEditor;
- }
-
- if (returnType.equals(Class.class)) {
- return classDialogCellEditor;
- }
-
- if (returnType.isArray()) {
- annotationArrayCellEditor.setMethod(method);
- return annotationArrayCellEditor;
- }
- if (returnType.isPrimitive()) {
- textCellEditor.setValidator(new ICellEditorValidator() {
- public String isValid(Object value) {
- try {
- if (returnType.equals(Byte.TYPE)) {
- Byte.parseByte((String) value);
- }
- if (returnType.equals(Short.TYPE)) {
- Short.parseShort((String) value);
- }
- if (returnType.equals(Integer.TYPE)) {
- Integer.parseInt((String) value);
- }
- if (returnType.equals(Long.TYPE)) {
- Long.parseLong((String) value);
- }
- if (returnType.equals(Float.TYPE)) {
- Float.parseFloat((String) value);
- }
- if (returnType.equals(Double.TYPE)) {
- Double.parseDouble((String) value);
- }
- } catch (NumberFormatException nfe) {
- return JAXWSUIMessages.ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX
- + returnType.getSimpleName();
- }
- return null;
- }
- });
- return textCellEditor;
- }
- return textCellEditor;
- }
- return checkboxCellEditor;
- }
-
- @Override
- protected Object getValue(Object element) {
- if (element instanceof Class) {
- return getValueForClass((Class<?>) element);
- }
- if (element instanceof Method) {
- return getValueForMethod((Method) element);
- }
- return null;
- }
-
- private Object getValueForClass(Class<?> aClass) {
- if (treeViewer.getInput() instanceof IAnnotatable) {
- return getValueForClass(aClass, (IAnnotatable) treeViewer.getInput());
- }
- return Boolean.FALSE;
- }
-
- private Object getValueForClass(Class<?> aClass, IAnnotatable annotatedElement) {
- try {
- IAnnotation[] annotations = annotatedElement.getAnnotations();
- for (IAnnotation annotation : annotations) {
- String annotationName = annotation.getElementName();
- if (AnnotationUtils.isAnnotationPresent((IJavaElement)annotatedElement, annotationName)
- && (annotationName.equals(aClass.getSimpleName())
- || annotationName.equals(aClass.getCanonicalName()))) {
- return Boolean.TRUE;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Boolean.FALSE;
- }
-
- private Object getValueForMethod(Method method) {
- Object value = null;
- try {
- if (treeViewer.getInput() instanceof IAnnotatable) {
- value = getValueForMethod(method, (IAnnotatable) treeViewer.getInput());
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return value;
- }
-
- private Object getValueForMethod(Method method, IAnnotatable annotatedElement) throws JavaModelException {
- Class<?> returnType = method.getReturnType();
- IAnnotation[] annotations = annotatedElement.getAnnotations();
- for (IAnnotation annotation : annotations) {
- Class<?> declaringClass = method.getDeclaringClass();
- String annotationName = annotation.getElementName();
- if (annotationName.equals(declaringClass.getSimpleName())
- || annotationName.equals(declaringClass.getCanonicalName())) {
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getMemberName().equals(method.getName())) {
- if (returnType.equals(String.class)) {
- return memberValuePair.getValue();
- }
-
- if (returnType.isEnum()) {
- String enumValue = memberValuePair.getValue().toString();
- String literal = enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
- Object[] enumConstants = method.getReturnType().getEnumConstants();
- for (int i = 0; i < enumConstants.length; i++) {
- if (enumConstants[i].toString().equals(literal)) {
- return i;
- }
- }
- }
-
- if (returnType.equals(Class.class)) {
- return memberValuePair.getValue();
- }
-
- if (returnType.equals(Boolean.TYPE)) {
- return memberValuePair.getValue();
- }
-
- if (returnType.isPrimitive()) {
- return ""; //$NON-NLS-1$
- }
- if (returnType.isArray()) {
- if (memberValuePair.getValueKind() == IMemberValuePair.K_CLASS) {
- Object[] arrayValues = (Object[])memberValuePair.getValue();
- for (int i = 0; i < arrayValues.length; i++) {
- String value = arrayValues[i].toString();
- arrayValues[i] = value + ".class"; //$NON-NLS-1$
- }
- return arrayValues;
- }
- return memberValuePair.getValue();
- }
- }
- }
- return getDefaultValueForMethod(returnType);
- }
- }
- return null;
- }
-
- private Object getDefaultValueForMethod(Class<?> returnType) {
- if (returnType.equals(String.class)) {
- return ""; //$NON-NLS-1$
- }
- if (returnType.equals(Boolean.TYPE)) {
- return Boolean.FALSE;
- }
- if (returnType.isEnum()) {
- return -1;
- }
- if (returnType.isPrimitive()) {
- return ""; //$NON-NLS-1$
- }
- if (returnType.isArray()) {
- return new Object[] {};
- }
- return null;
- }
-
- @Override
- protected void setValue(Object element, Object value) {
- if (value == null) {
- return;
- }
-
- try {
- if (element instanceof Class && ((Class<?>) element).isAnnotation()) {
- @SuppressWarnings("unchecked")
- Class<? extends java.lang.annotation.Annotation> annotationClass =
- (Class<? extends java.lang.annotation.Annotation>) element;
- if (annotationClass != null) {
- setValueForClass(annotationClass, (Boolean) value);
- }
- }
- if (element instanceof Method) {
- setValueForMethod((Method) element, value);
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- }
- }
-
- private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
- Boolean annotate) throws CoreException {
- Object viewerInput = treeViewer.getInput();
-
- IAnnotationAttributeInitializer annotationAttributeInitializer =
- AnnotationsManager.getAnnotationDefinitionForClass(annotationClass).getAnnotationAttributeInitializer();
-
- if (viewerInput instanceof IJavaElement) {
- setValueForClass(annotationClass, annotate, (IJavaElement) viewerInput, annotationAttributeInitializer);
- }
- }
-
- private Annotation getAnnotation(AST ast, Class<? extends java.lang.annotation.Annotation> annotationClass,
- List<MemberValuePair> memberValuePairs) {
-
- Annotation annotation = null;
- int numberOfDeclaredMethods = annotationClass.getDeclaredMethods().length;
- if (numberOfDeclaredMethods == 0) {
- annotation = AnnotationsCore.createMarkerAnnotation(ast, annotationClass.getSimpleName());
- } else if (numberOfDeclaredMethods == 1) {
- Expression value = null;
- if (memberValuePairs != null && memberValuePairs.size() == 1) {
- MemberValuePair memberValuePair = memberValuePairs.get(0);
- if (memberValuePair != null) {
- value = memberValuePair.getValue();
- }
- }
- if (value != null) {
- annotation = AnnotationsCore.createSingleMemberAnnotation(ast, annotationClass.getSimpleName(), value);
- } else {
- annotation = AnnotationsCore.createNormalAnnotation(ast, annotationClass.getSimpleName(), memberValuePairs);
- }
- } else if (numberOfDeclaredMethods > 1) {
- annotation = AnnotationsCore.createNormalAnnotation(ast, annotationClass.getSimpleName(), memberValuePairs);
- }
-
- return annotation;
- }
-
- private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
- Boolean annotate, IJavaElement javaElement, IAnnotationAttributeInitializer annotationAttributeInitializer)
- throws CoreException {
- ICompilationUnit source = AnnotationUtils.getCompilationUnitFromJavaElement(javaElement);
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- AST ast = compilationUnit.getAST();
-
- List<MemberValuePair> memberValuePairs = getMemberValuePairs(annotationAttributeInitializer, javaElement,
- ast, annotationClass);
-
- Annotation annotation = getAnnotation(ast, annotationClass, memberValuePairs);
-
- TextFileChange change = new TextFileChange("Add/Remove Annotation", (IFile) source.getResource()); //$NON-NLS-1$
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- if (annotate) {
- if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION
- || javaElement.getElementType() == IJavaElement.TYPE
- || javaElement.getElementType() == IJavaElement.FIELD
- || javaElement.getElementType() == IJavaElement.METHOD
- || javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- change.addEdit(AnnotationUtils.createAddAnnotationTextEdit(javaElement, annotation));
- change.addEdit(AnnotationUtils.createAddImportTextEdit(javaElement, annotationClass.getCanonicalName()));
- }
- } else {
- if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION
- || javaElement.getElementType() == IJavaElement.TYPE
- || javaElement.getElementType() == IJavaElement.FIELD
- || javaElement.getElementType() == IJavaElement.METHOD
- || javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- change.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(javaElement, annotation));
- change.addEdit(AnnotationUtils.createRemoveImportTextEdit(javaElement, annotationClass.getCanonicalName()));
- }
- }
- executeChange(new NullProgressMonitor(), change);
- }
-
- private List<MemberValuePair> getMemberValuePairs(
- IAnnotationAttributeInitializer annotationAttributeInitializer, IJavaElement javaElement, AST ast,
- Class<?extends java.lang.annotation.Annotation> annotationClass) {
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getMemberValuePairs(javaElement, ast, annotationClass);
- }
- return Collections.emptyList();
- }
-
-
- private void setValueForMethod(Method method, Object value) throws CoreException {
- if (((Boolean) getValue(method.getDeclaringClass())).booleanValue()) {
- Object viewerInput = treeViewer.getInput();
- if (viewerInput instanceof IAnnotatable) {
- setValueForMethod(method, value, (IJavaElement) viewerInput);
- }
- }
- }
-
- private void setValueForMethod(Method method, Object value, IJavaElement javaElement) throws CoreException {
- ICompilationUnit source = AnnotationUtils.getCompilationUnitFromJavaElement(javaElement);
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- AST ast = compilationUnit.getAST();
-
- TextFileChange change = new TextFileChange("Add/Update Annotation Value", (IFile) source.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- List<Annotation> annotations = AnnotationUtils.getAnnotations(javaElement);
- for (Annotation annotation : annotations) {
- if (annotation instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- Class<?> declaringClass = method.getDeclaringClass();
- String annotationName = normalAnnotation.getTypeName().getFullyQualifiedName();
- if (annotationName.equals(declaringClass.getSimpleName()) || annotationName.equals(declaringClass.getCanonicalName())) {
- @SuppressWarnings("unchecked")
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- boolean hasMemberValuePair = false;
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(method.getName())) {
- ASTNode memberValue = getMemberValuePairValue(ast, method, value);
- if (memberValue != null) {
- change.addEdit(AnnotationUtils.createUpdateMemberValuePairTextEdit(memberValuePair, memberValue));
- hasMemberValuePair = true;
- break;
- }
- }
- }
- if (!hasMemberValuePair) {
- MemberValuePair memberValuePair = getMemberValuePair(ast, method, value);
- if (memberValuePair != null) {
- change.addEdit(AnnotationUtils.createAddMemberValuePairTextEdit(normalAnnotation, memberValuePair));
- break;
- }
- }
- }
- } else if (annotation instanceof SingleMemberAnnotation) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- Class<?> declaringClass = method.getDeclaringClass();
- String annotationName = singleMemberAnnotation.getTypeName().getFullyQualifiedName();
- if (annotationName.equals(declaringClass.getSimpleName()) || annotationName.equals(declaringClass.getCanonicalName())) {
- MemberValuePair memberValuePair = getMemberValuePair(ast, method, value);
- if (memberValuePair != null) {
- change.addEdit(AnnotationUtils.createUpdateSingleMemberAnnotationTextEdit(singleMemberAnnotation, memberValuePair.getValue()));
- break;
- }
- }
-
- }
- }
-
- executeChange(new NullProgressMonitor(), change);
- }
-
- private ASTNode getMemberValuePairValue(AST ast, Method method, Object value) {
- Class<?> returnType = method.getReturnType();
- if (returnType.equals(String.class)) {
- return AnnotationsCore.createStringLiteral(ast, value.toString());
- }
- if (returnType.equals(Boolean.TYPE)) {
- return AnnotationsCore.createBooleanLiteral(ast, ((Boolean) value).booleanValue());
- }
- if (returnType.isPrimitive()
- && (returnType.equals(Byte.TYPE) || returnType.equals(Short.TYPE)
- || returnType.equals(Integer.TYPE) || returnType.equals(Long.TYPE)
- || returnType.equals(Float.TYPE) || returnType.equals(Double.TYPE))) {
- return AnnotationsCore.createNumberLiteral(ast, value.toString());
- }
- if (returnType.isArray()) {
- if (method.getReturnType().getComponentType().isAnnotation()) {
- return createArrayValueLiteral(ast, method, (Object[]) value);
- } else {
- return AnnotationsCore.createArrayValueLiteral(ast, (Object[]) value);
- }
- }
-
- if (returnType.equals(Class.class)) {
- return AnnotationsCore.createTypeLiteral(ast, value.toString());
- }
-
- if (returnType.isEnum()) {
- int selected = ((Integer) value).intValue();
- if (selected != -1) {
- return AnnotationsCore.createEnumLiteral(ast, method.getDeclaringClass().getCanonicalName(),
- method.getReturnType().getEnumConstants()[selected]);
- }
- }
- return null;
- }
-
- private MemberValuePair getMemberValuePair(AST ast, Method method, Object value) {
- Class<?> returnType = method.getReturnType();
- if (returnType.equals(String.class)) {
- return AnnotationsCore.createStringMemberValuePair(ast, method.getName(), (String) value);
- }
- if (returnType.equals(Boolean.TYPE)) {
- return AnnotationsCore.createBooleanMemberValuePair(ast, method.getName(), (Boolean) value);
- }
- if (returnType.isPrimitive()
- && (returnType.equals(Byte.TYPE) || returnType.equals(Short.TYPE)
- || returnType.equals(Integer.TYPE) || returnType.equals(Long.TYPE)
- || returnType.equals(Float.TYPE) || returnType.equals(Double.TYPE))) {
- return AnnotationsCore.createNumberMemberValuePair(ast, method.getName(), value.toString());
- }
- if (returnType.isArray()) {
- if (method.getReturnType().getComponentType().isAnnotation()) {
- return createArrayMemberValuePair(ast, method, (Object[]) value);
- } else {
- return AnnotationsCore.createArrayMemberValuePair(ast, method.getName(), (Object[]) value);
- }
- }
-
- if (returnType.equals(Class.class)) {
- return AnnotationsCore.createTypeMemberValuePair(ast, method.getName(), value.toString());
- }
-
- if (returnType.isEnum()) {
- int selected = ((Integer) value).intValue();
- if (selected != -1) {
- return AnnotationsCore.createEnumMemberValuePair(ast,
- method.getDeclaringClass().getCanonicalName(), method.getName(), method.getReturnType()
- .getEnumConstants()[selected]);
- }
- }
- return null;
- }
-
- private void executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return;
- }
-
- IUndoManager manager = RefactoringCore.getUndoManager();
- boolean successful = false;
- Change undoChange = null;
- try {
- change.initializeValidationData(monitor);
- RefactoringStatus valid = change.isValid(monitor);
- if (valid.isOK()) {
- manager.aboutToPerformChange(change);
- undoChange = change.perform(monitor);
- successful = true;
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- } finally {
- manager.changePerformed(change, successful);
- }
- if (undoChange != null) {
- undoChange.initializeValidationData(monitor);
- manager.addUndo(undoChange.getName(), undoChange);
- }
- annotationsView.refreshLabels();
- }
-
- private MemberValuePair createArrayMemberValuePair(AST ast, Method method, Object[] values) {
- return AnnotationsCore.createMemberValuePair(ast, method.getName(), createArrayValueLiteral(ast,
- method, values));
- }
-
- @SuppressWarnings("unchecked")
- private ArrayInitializer createArrayValueLiteral(AST ast, Method method, Object[] values) {
- ArrayInitializer arrayInitializer = ast.newArrayInitializer();
- for (Object value : values) {
- if (value instanceof List) {
- Class<? extends java.lang.annotation.Annotation> annotationClass =
- (Class<? extends java.lang.annotation.Annotation>) method.getReturnType().getComponentType();
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- List<Map<String, Object>> valuesList = (List<Map<String, Object>>) value;
- Iterator<Map<String, Object>> valuesIterator = valuesList.iterator();
- while (valuesIterator.hasNext()) {
- Map<String, Object> annotationMap = valuesIterator.next();
- Set<Entry<String, Object>> entrySet = annotationMap.entrySet();
- Iterator<Map.Entry<String, Object>> iterator = entrySet.iterator();
- while (iterator.hasNext()) {
- Map.Entry<java.lang.String, Object> entry = iterator.next();
- String memberName = entry.getKey();
- try {
- Method annotationMethod = annotationClass.getMethod(memberName, new Class[0]);
- if (annotationMethod != null) {
- Object memberValue = entry.getValue();
- Class<?> returnType = annotationMethod.getReturnType();
- if (returnType.equals(String.class)) {
- memberValuePairs.add(AnnotationsCore.createStringMemberValuePair(ast, memberName,
- memberValue.toString()));
- }
- if (returnType.equals(Boolean.TYPE)) {
- memberValuePairs.add(AnnotationsCore.createBooleanMemberValuePair(ast, memberName,
- (Boolean) memberValue));
- }
- if (returnType.equals(Class.class)) {
- String className = memberValue.toString();
- if (className.endsWith(".class")) {
- className = className.substring(0, className.lastIndexOf("."));
- }
- memberValuePairs.add(AnnotationsCore.createMemberValuePair(ast, memberName,
- AnnotationsCore.createTypeLiteral(ast, className)));
- }
- // if (returnType.isPrimitive()) {
- // memberValuePairs.add(getNumberMemberValuePair(ast, memberName, memberValue));
- // }
- }
-
- } catch (SecurityException se) {
- AnnotationsCorePlugin.log(se);
- } catch (NoSuchMethodException nsme) {
- AnnotationsCorePlugin.log(nsme);
- }
- }
- }
- arrayInitializer.expressions().add(AnnotationsCore.createNormalAnnotation(ast, annotationClass.getCanonicalName(),
- memberValuePairs));
- }
- }
- return arrayInitializer;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java
deleted file mode 100755
index 74138ac..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.annotations.core.AnnotationDefinition;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.actions.AnnotationsViewFilterAction;
-import org.eclipse.jst.ws.internal.jaxws.ui.widgets.ClasspathComposite;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.INullSelectionListener;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class AnnotationsView extends ViewPart implements INullSelectionListener, IPartListener2 {
- private PageBook pageBook;
- private Tree annotationTree;
-
- private Composite notAvaiableComposite;
- private ClasspathComposite setupClasspathComposite;
-
- private TreeViewer annotationTreeViewer;
-
- private IMemento memento;
-
- private AnnotationsViewFilterAction annotationsViewFilterAction;
-
- public AnnotationsView() {
- }
-
- @Override
- public void createPartControl(Composite parent) {
- pageBook = new PageBook(parent, SWT.NONE);
-
- annotationTree = new Tree(pageBook, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER | SWT.V_SCROLL
- | SWT.H_SCROLL);
- annotationTreeViewer = new TreeViewer(annotationTree);
-
- annotationTreeViewer.setContentProvider(new AnnotationsViewContentProvider());
- annotationTreeViewer.getTree().setHeaderVisible(true);
- annotationTreeViewer.getTree().setLinesVisible(true);
-
- TreeViewerColumn annotationsViewerColumn = new TreeViewerColumn(annotationTreeViewer, SWT.NONE);
- annotationsViewerColumn.setLabelProvider(new AnnotationsColumnLabelProvider());
- TreeColumn annotationsColumn = annotationsViewerColumn.getColumn();
- annotationsColumn.setWidth(400);
- annotationsColumn.setMoveable(false);
- annotationsColumn.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME);
-
- TreeViewerColumn valuesViewerColumn = new TreeViewerColumn(annotationTreeViewer, SWT.NONE);
- valuesViewerColumn.setLabelProvider(new AnnotationsValuesColumnLabelProvider(annotationTreeViewer));
- valuesViewerColumn.setEditingSupport(new AnnotationsValuesEditingSupport(this, annotationTreeViewer));
- TreeColumn valuesColumn = valuesViewerColumn.getColumn();
- valuesColumn.setWidth(400);
- valuesColumn.setMoveable(false);
- valuesColumn.setAlignment(SWT.LEFT);
- valuesColumn.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME);
-
- //Selection Service
- startListeningForSelectionChanges();
- //Part Service
- getViewSite().getWorkbenchWindow().getPartService().addPartListener(this);
-
- contributeToActionBars();
-
- notAvaiableComposite = new Composite(pageBook, SWT.NONE);
- GridLayout gridLayout = new GridLayout();
- notAvaiableComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- notAvaiableComposite.setLayoutData(gridData);
- notAvaiableComposite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
- Label label = new Label(notAvaiableComposite, SWT.NONE);
- label.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
- label.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION);
-
- annotationTreeViewer.setComparator(new ViewerComparator() {
- @Override
- public int compare(Viewer viewer, Object obj1, Object obj2) {
- if ((obj1 instanceof Class<?> && ((Class<?>) obj1).isAnnotation())
- && (obj2 instanceof Class<?> && ((Class<?>) obj2).isAnnotation())) {
- return ((Class<? extends java.lang.annotation.Annotation>) obj1).getCanonicalName().compareTo(
- ((Class<? extends java.lang.annotation.Annotation>) obj2).getCanonicalName());
- }
- if (obj1 instanceof Method && obj2 instanceof Method) {
- return ((Method)obj1).getName().compareTo(((Method)obj2).getName());
- }
- return super.compare(viewer, obj1, obj2);
- }
- });
-
- //TODO Add a Faceted Project composite
- setupClasspathComposite = new ClasspathComposite(pageBook, SWT.NONE);
-
- pageBook.showPage(notAvaiableComposite);
- }
-
- private void startListeningForSelectionChanges() {
- getViewSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(this);
- }
-
- private void stopListeningForSelectionChanges() {
- getViewSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(this);
- }
-
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- IWorkbenchPage workbenchPage = getViewSite().getWorkbenchWindow().getActivePage();
-
- if (workbenchPage == null) {
- return;
- }
-
- IWorkbenchPartReference workbenchPartReference = workbenchPage.getActivePartReference();
-
- if (workbenchPartReference == null || workbenchPartReference.getId().equals(getViewSite().getId())
- || !workbenchPartReference.getId().equals(JavaUI.ID_CU_EDITOR)) {
- return;
- }
-
- IEditorPart editorPart = workbenchPage.getActiveEditor();
-
- IFileEditorInput fileEditorInput = (IFileEditorInput) editorPart.getEditorInput();
-
- if (selection instanceof TextSelection) {
- ITextSelection txtSelection = (TextSelection) selection;
- ICompilationUnit compilationUnit = JavaCore.createCompilationUnitFrom(fileEditorInput.getFile());
- if (compilationUnit != null) {
- updateView(compilationUnit, txtSelection);
- }
- }
- }
-
- public void updateView(IJavaElement javaElement, ITextSelection textSelection) {
- TreePath[] expandedTreePaths = annotationTreeViewer.getExpandedTreePaths();
-
- IJavaProject javaProject = javaElement.getJavaProject();
-
- if (!checkClasspath(javaProject)) {
- annotationTreeViewer.setInput(null);
- pageBook.showPage(setupClasspathComposite);
- return;
- }
-
- pageBook.showPage(annotationTree);
-
- int offset = textSelection.getOffset();
- try {
- ICompilationUnit compilationUnit = null;
- if (javaElement instanceof ICompilationUnit) {
- compilationUnit = (ICompilationUnit)javaElement;
- javaElement = compilationUnit.getElementAt(offset);
- }
-
- if (javaElement == null) {
- return;
- }
-
- if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION) {
- if (javaElement.getResource().getName().equals("package-info.java")) { //$NON-NLS-1$
- setInput(javaElement);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.IMPORT_DECLARATION) {
- annotationTreeViewer.setInput(null);
- }
-
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType)javaElement;
- if (!type.isMember()) {
- setInput(type);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IField field = (IField)javaElement;
- if (!field.getDeclaringType().isMember()) {
- setInput(field);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- if (!method.getDeclaringType().isMember()) {
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, offset);
- if (localVariable != null) {
- setInput(localVariable);
- } else {
- setInput(method);
- }
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
- annotationTreeViewer.refresh();
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
-
- annotationTreeViewer.setExpandedTreePaths(expandedTreePaths);
- }
-
- private void setInput(IJavaElement javaElement) {
- if (annotationTreeViewer.getInput() == null) {
- annotationTreeViewer.setInput(javaElement);
- } else if (!annotationTreeViewer.getInput().equals(javaElement)) {
- annotationTreeViewer.setInput(javaElement);
- }
- }
-
- private boolean checkClasspath(IJavaProject javaProject) {
- List<String> categories = new ArrayList<String>();
- categories.addAll(AnnotationsManager.getAnnotationCategories());
- ViewerFilter[] viewerFilters = annotationTreeViewer.getFilters();
- for (ViewerFilter viewerFilter : viewerFilters) {
- if (viewerFilter instanceof AnnotationsViewCategoryFilter) {
- categories.removeAll(((AnnotationsViewCategoryFilter)viewerFilter).getCategories());
- }
- }
-
- boolean jwsReady = true;
- try {
- for (String category : categories) {
- List<AnnotationDefinition> annotationDefinitions = AnnotationsManager
- .getAnnotationsByCategory(category);
- String className = annotationDefinitions.get(0).getAnnotationClassName();
- if (javaProject.findType(className) == null) {
- jwsReady = false;
- setupClasspathComposite.updateLibraryLabel(category);
- break;
- } else {
- continue;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return jwsReady;
- }
-
- public void partActivated(IWorkbenchPartReference partRef) {
- IWorkbenchPart workbenchPart = partRef.getPart(false);
- if (partRef.getId().equals(JavaUI.ID_CU_EDITOR)) {
- javaEditorActivated((IEditorPart) workbenchPart);
- } else if (partRef.getId().equals(getViewSite().getId())) {
- annotationsViewActivated();
- } else {
- clearAnnotationsView();
- }
- }
-
- public void partDeactivated(IWorkbenchPartReference partRef) {
- }
-
- public void partVisible(IWorkbenchPartReference partRef) {
- if (partRef.getId().equals(getViewSite().getId())) {
- startListeningForSelectionChanges();
- }
- }
-
- public void partHidden(IWorkbenchPartReference partRef) {
- if (partRef.getId().equals(getViewSite().getId())) {
- stopListeningForSelectionChanges();
- }
- }
-
- public void partOpened(IWorkbenchPartReference partRef) {
- }
-
- public void partClosed(IWorkbenchPartReference partRef) {
- if (partRef.getId().equals(JavaUI.ID_CU_EDITOR)) {
- if (getViewSite() != null) {
- IWorkbenchWindow workbenchWindow = getViewSite().getWorkbenchWindow();
- if (workbenchWindow != null) {
- IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- if (workbenchPage != null) {
- IEditorPart editorPart = workbenchPage.getActiveEditor();
- try {
- if (editorPart == null
- || !(editorPart.getEditorInput() instanceof IFileEditorInput)
- || !IDE.getEditorDescriptor(
- ((IFileEditorInput) editorPart.getEditorInput()).getFile()).getId()
- .equals(JavaUI.ID_CU_EDITOR)) {
- clearAnnotationsView();
- }
- } catch (PartInitException pie) {
- JAXWSUIPlugin.log(pie.getStatus());
- }
- }
- }
- }
- }
- }
-
- public void partBroughtToTop(IWorkbenchPartReference partRef) {
- }
-
- public void partInputChanged(IWorkbenchPartReference partRef) {
- }
-
- private void clearAnnotationsView() {
- annotationTreeViewer.setInput(null);
- annotationTreeViewer.refresh();
- pageBook.showPage(notAvaiableComposite);
- }
-
- private void javaEditorActivated(IEditorPart editorPart) {
- ITextEditor textEditor = (ITextEditor) editorPart;
- ISelection selection = textEditor.getSelectionProvider().getSelection();
- IJavaElement javaElement = (IJavaElement) editorPart.getEditorInput().getAdapter(IJavaElement.class);
- if (javaElement != null) {
- pageBook.showPage(annotationTree);
- updateView(javaElement, (ITextSelection) selection);
- selectionChanged(editorPart, selection);
- }
- }
-
- private void annotationsViewActivated() {
- try {
- IEditorPart editorPart = getViewSite().getPage().getActiveEditor();
- if (editorPart != null) {
- IEditorInput editorInput = editorPart.getEditorInput();
- if (editorInput instanceof IFileEditorInput) {
- IFile file = ((IFileEditorInput) editorInput).getFile();
- IEditorDescriptor editorDescriptor = IDE.getEditorDescriptor(file);
- if (editorDescriptor.getId().equals(JavaUI.ID_CU_EDITOR)) {
- javaEditorActivated(editorPart);
- }
- }
- }
- } catch (PartInitException pie) {
- JAXWSUIPlugin.log(pie.getStatus());
- }
- }
-
- @Override
- public void dispose() {
- super.dispose();
- stopListeningForSelectionChanges();
- getViewSite().getWorkbenchWindow().getPartService().removePartListener(this);
- }
-
- @Override
- public void init(IViewSite site, IMemento memento) throws PartInitException {
- super.init(site, memento);
- this.memento = memento;
- }
-
- @Override
- public void saveState(IMemento memento) {
- super.saveState(memento);
- annotationsViewFilterAction.saveState(memento);
- }
-
- private void contributeToActionBars() {
- IActionBars bars = getViewSite().getActionBars();
- fillLocalPullDown(bars.getMenuManager());
- }
-
- private void fillLocalPullDown(IMenuManager manager) {
- annotationsViewFilterAction = new AnnotationsViewFilterAction(this, annotationTreeViewer,
- JAXWSUIMessages.ANNOTATIONS_VIEW_FILTER_ACTION_NAME);
- if (memento != null) {
- annotationsViewFilterAction.init(memento);
- }
- manager.add(annotationsViewFilterAction);
- }
-
- /**
- * Passing the focus request to the viewer's control.
- */
- @Override
- public void setFocus() {
- annotationTreeViewer.getControl().setFocus();
- }
-
- public void refreshLabels() {
- annotationTreeViewer.refresh();
- }
-
- public void refresh() {
- Display display = annotationTreeViewer.getControl().getDisplay();
- if (!display.isDisposed()) {
- display.asyncExec(new Runnable() {
- public void run() {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- IEditorPart editorPart = workbenchPage.getActiveEditor();
- try {
- if (editorPart != null
- && editorPart.getEditorInput() instanceof IFileEditorInput
- && IDE.getEditorDescriptor(
- ((IFileEditorInput) editorPart.getEditorInput()).getFile()).getId()
- .equals(JavaUI.ID_CU_EDITOR)) {
- ITextEditor txtEditor = (ITextEditor) workbenchPage.getActiveEditor();
- IFileEditorInput fileEditorInput = (IFileEditorInput) txtEditor.getEditorInput();
- ICompilationUnit compilationUnit = JavaCore.createCompilationUnitFrom(fileEditorInput.getFile());
- if (compilationUnit != null) {
- if (!compilationUnit.isConsistent()) {
- compilationUnit.makeConsistent(new NullProgressMonitor());
- }
- updateView(compilationUnit, (ITextSelection) txtEditor.getSelectionProvider()
- .getSelection());
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- } catch (PartInitException pie) {
- JAXWSUIPlugin.log(pie.getStatus());
- }
- }
- });
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java
deleted file mode 100644
index dc6af12..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.annotations.core.AnnotationDefinition;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.ui.IMemento;
-
-public class AnnotationsViewCategoryFilter extends ViewerFilter {
- private static final String TAG_CATEGORY = "AnnotationCategoryFilterInfo"; //$NON-NLS-1$
- private static final String TAG_CATEGORY_NAME = "categoryName"; //$NON-NLS-1$
-
- private AnnotationsView annotationsView;
- private final StructuredViewer viewer;
-
- private List<Object> categories;
-
- public AnnotationsViewCategoryFilter(AnnotationsView annotationsView, StructuredViewer viewer) {
- this.annotationsView = annotationsView;
- this.viewer = viewer;
- categories = new ArrayList<Object>();
- }
-
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (element instanceof Class && ((Class<?>) element).isAnnotation()) {
- AnnotationDefinition annotationDefinition = AnnotationsManager.
- getAnnotationDefinitionForClass((Class<? extends Annotation>)element);
- if (annotationDefinition != null) {
- return !categories.contains(annotationDefinition.getCategory());
- }
- }
- return true;
- }
-
- public void filterAnnotations(List<Object> categories) {
- this.categories = categories;
- if (categories.size() > 0) {
- viewer.addFilter(this);
- } else {
- viewer.removeFilter(this);
- }
- annotationsView.refresh();
- }
-
- public List<Object> getCategories() {
- return categories;
- }
-
- public void init(IMemento memento) {
- IMemento catMemento = memento.getChild(TAG_CATEGORY);
- if (catMemento == null) {
- return;
- }
- for (int i = 0; i < AnnotationsManager.getAnnotationCategories().size(); i++) {
- String category = catMemento.getString(TAG_CATEGORY_NAME + i);
- if (category != null) {
- categories.add(category);
- }
- }
- filterAnnotations(categories);
- }
-
- public void saveState(IMemento memento) {
- if (categories == null || categories.size() == 0) {
- return;
- }
- IMemento catMemento = memento.createChild(TAG_CATEGORY);
- int i = 0;
- for (Object category : categories) {
- catMemento.putString(TAG_CATEGORY_NAME + i, category.toString());
- i++;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java
deleted file mode 100755
index 5a22bee..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-
-public class AnnotationsViewContentProvider implements ITreeContentProvider {
-
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof Class) {
- return ((Class<?>)parentElement).getDeclaredMethods();
- }
- return new Object[] {};
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof Class) {
- return ((Class<?>)element).getDeclaredMethods().length > 0;
- }
- return false;
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement != null && inputElement instanceof IJavaElement && ((IJavaElement) inputElement).exists()) {
- IJavaElement javaElement = (IJavaElement) inputElement;
- return AnnotationsManager.getAnnotations(javaElement).toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
-
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java
deleted file mode 100644
index ebe786b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-public class ClassDialogCellEditor extends DialogCellEditor {
-
- public ClassDialogCellEditor(Composite parent) {
- super(parent, SWT.NONE);
- }
-
- @Override
- protected Object openDialogBox(Control cellEditorWindow) {
- try {
- SelectionDialog dialog = JavaUI.createTypeDialog(cellEditorWindow.getShell(),
- PlatformUI.getWorkbench().getProgressService(),
- SearchEngine.createWorkspaceScope(), IJavaElementSearchConstants.CONSIDER_CLASSES,
- false, "* "); //$NON-NLS-1$
-
- if (dialog.open() == IDialogConstants.OK_ID) {
- Object[] types = dialog.getResult();
-
- if (types != null && types.length > 0) {
- IType type = (IType)types[0];
- if (type.isBinary()) {
- return type.getFullyQualifiedName();
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return null;
- }
-
- @Override
- protected void updateContents(Object value) {
- if (value != null) {
- getDefaultLabel().setText(value.toString() + ".class"); //$NON-NLS-1$
- } else {
- getDefaultLabel().setText(""); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java
deleted file mode 100644
index d9debc5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.widgets;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.part.FileEditorInput;
-
-public class ClasspathComposite extends Composite {
-
- private String JRE_PREF_PAGE_ID = "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"; //$NON-NLS-1$
- private String PROP_ID = "org.eclipse.jdt.ui.propertyPages.BuildPathsPropertyPage"; //$NON-NLS-1$
- private Object DATA_REVEAL_ENTRY = "select_classpath_entry"; //$NON-NLS-1$
-
- private Label informationLabel;
-
- public ClasspathComposite(Composite parent, int style) {
- super(parent, style);
- addControls();
- }
-
- public void addControls() {
- GridLayout gridLayout = new GridLayout();
- this.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- this.setLayoutData(gridData);
- this.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
- informationLabel = new Label(this, SWT.NONE);
- informationLabel.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
- informationLabel.setText(JAXWSUIMessages.bind(
- JAXWSUIMessages.ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND, "JAX-WS")); //$NON-NLS-1$
- Link link = new Link(this, SWT.NONE);
- link.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
- link.setText(JAXWSUIMessages.CONFIGURE_JAVA_1_6_LIBRARY);
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent selectionEvent) {
- if (selectionEvent.text.equals("1")) { //$NON-NLS-1$
- PreferencesUtil.createPreferenceDialogOn(getShell(), JRE_PREF_PAGE_ID,
- new String[] { JRE_PREF_PAGE_ID }, null).open();
- } else {
- Map<Object, IClasspathEntry> data = new HashMap<Object, IClasspathEntry>();
- data.put(DATA_REVEAL_ENTRY, JavaRuntime.getDefaultJREContainerEntry());
- PreferencesUtil.createPropertyDialogOn(getShell(), getProject(), PROP_ID,
- new String[] { PROP_ID }, data).open();
- }
- }
- });
- //TODO update the labels to provide information for supported annotation libraries that are missing
- //on the selected projects classpath.
- //Label otherLibrariesLabel = new Label(this, SWT.SHADOW_IN);
- //otherLibrariesLabel.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
- //otherLibrariesLabel.setText("Annotation Libraries currently supported: " + AnnotationsManager.getAnnotationCategories());
- //otherLibrariesLabel.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE);
-
- }
-
- private IProject getProject() {
- return ((FileEditorInput) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .getActiveEditor().getEditorInput()).getFile().getProject();
- }
-
-
- public void updateLibraryLabel(String libraryName) {
- informationLabel.setText(JAXWSUIMessages.bind(
- JAXWSUIMessages.ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND, libraryName));
- }
-
- }
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/AddHandlerChainPage.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/AddHandlerChainPage.java
deleted file mode 100644
index 12da06d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/AddHandlerChainPage.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.dialogs.HandlerChainSelectionDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.dialogs.NewHandlerChainDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.filters.NewHandlerChainViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class AddHandlerChainPage extends WizardPage {
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- private IStatus addNewHandlerChainStatus = Status.OK_STATUS;
- private IStatus editHandlerChainStatus = Status.OK_STATUS;
-
- private IType type;
-
- private Button createHandlerChainButton;
- private Text newHandlerChainText;
- private Button browseNewHandlerChainButton;
-
- private Button editHandlerChainButton;
- private Text exisitingHandlerChainText;
- private Button browseExistingHandlerChainButton;
-
- private boolean fileCreated;
-
- protected AddHandlerChainPage(IType type) {
- super("add.handlerchain.wizard.page"); //$NON-NLS-1$
- this.type = type;
- setTitle(JAXWSUIMessages.JAXWS_ADD_HANDLER_WIZARD_PAGE_TITLE);
- setDescription(JAXWSUIMessages.JAXWS_ADD_HANDLER_WIZARD_PAGE_DESCRIPTION);
- }
-
- public void createControl(Composite parent) {
- initializeDialogUnits(parent);
-
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setFont(parent.getFont());
-
- int nColumns = 4;
-
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns= nColumns;
- composite.setLayout(gridLayout);
-
- createHandlerChainButton = new Button(composite, SWT.RADIO);
- createHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- createHandlerChainButton.setLayoutData(gridData);
- createHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.widget;
- enableNewHandlerChainFileWidgets(button.getSelection());
- enableEditHandlerChainFileWidgets(!button.getSelection());
- updateConfigureHandlerStatus();
- }
- });
-
- Label createNewHandlerLabel = new Label(composite, SWT.NONE);
- createNewHandlerLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_FILE_PATH);
-
- newHandlerChainText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- newHandlerChainText.setFont(composite.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- newHandlerChainText.setLayoutData(gridData);
-
- newHandlerChainText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
- });
-
- browseNewHandlerChainButton = new Button(composite, SWT.PUSH);
- browseNewHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE);
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseNewHandlerChainButton.setLayoutData(gridData);
- browseNewHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- NewHandlerChainDialog dialog = new NewHandlerChainDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- dialog.addFilter(new NewHandlerChainViewerFilter(type.getJavaProject(), true, true));
- if (dialog.open() == Window.OK) {
- newHandlerChainText.setText(dialog.getFilePath());
- updateConfigureHandlerStatus();
- }
- }
- });
-
- editHandlerChainButton = new Button(composite, SWT.RADIO);
- editHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CHOOSE);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- editHandlerChainButton.setLayoutData(gridData);
-
- Label addToHandlerLabel = new Label(composite, SWT.NONE);
- addToHandlerLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_FILE_PATH);
-
- editHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- exisitingHandlerChainText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- exisitingHandlerChainText.setFont(composite.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- exisitingHandlerChainText.setLayoutData(gridData);
- exisitingHandlerChainText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- browseExistingHandlerChainButton = new Button(composite, SWT.PUSH);
- browseExistingHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- browseExistingHandlerChainButton.setLayoutData(gridData);
-
- browseExistingHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- HandlerChainSelectionDialog dialog = new HandlerChainSelectionDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
-
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- dialog.addFilter(new NewHandlerChainViewerFilter(type.getJavaProject(), false, true));
-
- if (dialog.open() == Window.OK) {
- Object[] result = dialog.getResult();
- IResource resource = (IResource) result[0];
- exisitingHandlerChainText.setText(resource.getFullPath().toOSString());
- updateConfigureHandlerStatus();
- }
- }
- });
-
-
- setInitialSelection();
- setControl(composite);
- }
-
- private void setInitialSelection() {
- IPath handlerChainPath = new Path(type.getResource().getParent().getFullPath().addTrailingSeparator()
- + "handler-chain.xml");
- IResource handlerChain = ResourcesPlugin.getWorkspace().getRoot().getFile(handlerChainPath);
- if (handlerChain.exists()) {
- editHandlerChainButton.setSelection(true);
- exisitingHandlerChainText.setText(handlerChainPath.toString());
- enableNewHandlerChainFileWidgets(false);
- enableEditHandlerChainFileWidgets(true);
- } else {
- createHandlerChainButton.setSelection(true);
- newHandlerChainText.setText(handlerChainPath.toString());
- enableNewHandlerChainFileWidgets(true);
- enableEditHandlerChainFileWidgets(false);
- }
- updateConfigureHandlerStatus();
- }
-
- public void setFileCreated(boolean fileCreated) {
- this.fileCreated = fileCreated;
- }
-
- @Override
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (visible && fileCreated) {
- ((ConfigureHandlerWizard) getWizard()).deleteFile(new Path(getNewHandlerChainPath()));
- }
- }
-
- private void enableEditHandlerChainFileWidgets(boolean enable) {
- exisitingHandlerChainText.setEnabled(enable);
- browseExistingHandlerChainButton.setEnabled(enable);
- }
-
- private void enableNewHandlerChainFileWidgets(boolean enable) {
- newHandlerChainText.setEnabled(enable);
- browseNewHandlerChainButton.setEnabled(enable);
- }
-
- public boolean isCreateHandlerChain() {
- return createHandlerChainButton.getSelection();
- }
-
- public boolean isEditHandlerChain() {
- return editHandlerChainButton.getSelection();
- }
-
- public String getNewHandlerChainPath() {
- return newHandlerChainText.getText();
- }
-
- public String getExistingHandlerChainPath() {
- return exisitingHandlerChainText.getText();
- }
-
- private void updateConfigureHandlerStatus() {
- try {
- validateNewHandlerChainField();
- validateExistingHandlerChainField();
- if (addNewHandlerChainStatus.getSeverity() != IStatus.OK || editHandlerChainStatus.getSeverity() != IStatus.OK) {
- setErrorMessage(findMostSevere().getMessage());
- setPageComplete(false);
- } else {
- setErrorMessage(null);
- setPageComplete(true);
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
-
- private IStatus findMostSevere() {
- if (addNewHandlerChainStatus.getSeverity() > editHandlerChainStatus.getSeverity()) {
- return addNewHandlerChainStatus;
- }
- if (editHandlerChainStatus.getSeverity() > addNewHandlerChainStatus.getSeverity()) {
- return editHandlerChainStatus;
- }
- if (addNewHandlerChainStatus.getSeverity() == editHandlerChainStatus.getSeverity()) {
- return addNewHandlerChainStatus;
- }
-
- return addNewHandlerChainStatus;
- }
-
- private IStatus validateNewHandlerChainField() throws JavaModelException {
- if (isCreateHandlerChain()) {
- editHandlerChainStatus = ok_status;
- String newHandlerChainPath = getNewHandlerChainPath().trim();
- if (newHandlerChainPath.length() == 0) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_NEW_HANDLER_PATH_EMTPY);
- }
-
- if (!newHandlerChainPath.endsWith(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IPath path = new Path(newHandlerChainPath);
- if (path.segmentCount() >= 2) {
- String[] segmenets = path.segments();
- if (!segmenets[0].equals(type.getJavaProject().getElementName())) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- type.getJavaProject().getElementName()));
- }
- boolean inSourceFolder = false;
- IPackageFragmentRoot[] packageFragmentRoots = type.getJavaProject().getPackageFragmentRoots();
- for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
- if (segmenets[1].equals(packageFragmentRoot.getElementName())) {
- inSourceFolder = true;
- break;
- }
- }
- if (!inSourceFolder) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- type.getJavaProject().getElementName()));
- }
- if (path.lastSegment() != null && path.lastSegment().equals(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME);
- }
- } else {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- type.getJavaProject().getElementName()));
- }
-
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
- if (res != null && res.exists()) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS,
- res.getName()));
- }
-
- return addNewHandlerChainStatus = ok_status;
- } else {
- return addNewHandlerChainStatus = ok_status;
- }
- }
-
- private IStatus validateExistingHandlerChainField() {
- if (isEditHandlerChain()) {
- addNewHandlerChainStatus = ok_status;
- String existingHandlerChainPath = getExistingHandlerChainPath().trim();
- if (existingHandlerChainPath.length() == 0) {
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EXISTING_HANDLER_PATH_EMTPY);
- }
-
- if (!existingHandlerChainPath.endsWith(".xml")) { //$NON-NLS-1$
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(existingHandlerChainPath);
-
- if (path.segmentCount() >= 2) {
- if (path.lastSegment() != null && path.lastSegment().equals(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME);
- }
- }
-
- if (path.segmentCount() >= 2 && path.segment(0).equals(type.getJavaProject().getElementName())
- && workspace.getRoot().getFile(path).exists()) {
- return editHandlerChainStatus = ok_status;
- } else {
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND,
- existingHandlerChainPath));
- }
- } else {
- return editHandlerChainStatus = ok_status;
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/ConfigureHandlerWizard.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/ConfigureHandlerWizard.java
deleted file mode 100644
index 3cf7e82..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/ConfigureHandlerWizard.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.HandlerChain;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSHandlerUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-public class ConfigureHandlerWizard extends Wizard {
- private AddHandlerChainPage addHandlerChainPage;
- private OrderHandlerChainPage orderHandlerChainPage;
-
- private boolean fileCreated;
- private boolean addAnnotation;
-
- private IPath handlerChainPath;
- private IType type;
-
- public ConfigureHandlerWizard(IType type) {
- this.type = type;
- setWindowTitle(JAXWSUIMessages.JAXWS_CONFIGURE_HANDLER_WIZARD_TITLE);
- //TODO replace with dedicated handler wizban
- setDefaultPageImageDescriptor(JAXWSUIPlugin.getImageDescriptor("$nl$/icons/wizban/new_wiz.png")); //$NON-NLS-1$
- handlerChainPath = getHandlerChainPath(type);
- }
-
- @Override
- public void addPages() {
- if (addHandlerChainPage == null) {
- addHandlerChainPage = new AddHandlerChainPage(type);
- }
- if (orderHandlerChainPage == null) {
- orderHandlerChainPage = new OrderHandlerChainPage(handlerChainPath, type.getJavaProject());
- }
- if (handlerChainPath != null && handlerChainPath.isEmpty()) {
- addPage(addHandlerChainPage);
- }
- addPage(orderHandlerChainPage);
- }
-
- @Override
- public IWizardPage getNextPage(IWizardPage page) {
- if (page == addHandlerChainPage && addHandlerChainPage.isPageComplete()) {
- if (addHandlerChainPage.isCreateHandlerChain()) {
- handlerChainPath = new Path(addHandlerChainPage.getNewHandlerChainPath());
- orderHandlerChainPage.setHandlerChainPath(handlerChainPath);
- addAnnotation = true;
- fileCreated = true;
- addHandlerChainPage.setFileCreated(fileCreated);
- }
- if (addHandlerChainPage.isEditHandlerChain()) {
- handlerChainPath = new Path(addHandlerChainPage.getExistingHandlerChainPath());
- orderHandlerChainPage.setHandlerChainPath(handlerChainPath);
- addAnnotation = true;
- fileCreated = false;
- addHandlerChainPage.setFileCreated(fileCreated);
- }
- }
- return super.getNextPage(page);
- }
-
- private IPath getHandlerChainPath(IType type) {
- if (type != null) {
- Annotation handlerChain = AnnotationUtils.getAnnotation(type, HandlerChain.class);
- if (handlerChain != null) {
- String file = AnnotationUtils.getStringValue(handlerChain, "file"); //$NON-NLS-1$
- if (file != null) {
- if (!file.startsWith("../")) { //$NON-NLS-1$
- return type.getPackageFragment().getPath().append(new Path(file));
- } else {
- return findHandlerChainPath(file);
- }
- }
- }
- }
- return Path.EMPTY;
- }
-
- private IPath findHandlerChainPath(String file) {
- IContainer container = type.getResource().getParent();
- if (container != null) {
- while(file.startsWith("../")) { //$NON-NLS-1$
- file = file.substring(3);
- if (container != null) {
- container = container.getParent();
- }
- }
- if (container != null) {
- IResource handlerChainFile = container.findMember(file);
- if (handlerChainFile != null) {
- return handlerChainFile.getFullPath();
- }
- }
- }
- return Path.EMPTY;
- }
-
- @Override
- public boolean performFinish() {
- try {
-
- ISchedulingRule rule = null;
- Job job = Job.getJobManager().currentJob();
- if (job != null) {
- rule = job.getRule();
- } else {
- rule = ResourcesPlugin.getWorkspace().getRoot();
- }
- WorkspaceModifyOperation workspaceModifyOperation = new WorkspaceModifyOperation(rule) {
-
- @Override
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- if (addAnnotation) {
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(handlerChainPath);
-
- URI relativeURI = URI.createPlatformResourceURI(handlerChainFile.getLocation().toOSString(),
- false).deresolve(
- URI.createPlatformResourceURI(type.getResource().getLocation().toOSString(),
- false));
-
- ICompilationUnit compilationUnit = type.getCompilationUnit();
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(compilationUnit);
- CompilationUnit cu = (CompilationUnit)parser.createAST(null);
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- MemberValuePair filePair = AnnotationsCore.createStringMemberValuePair(cu.getAST(),
- "file", relativeURI.toFileString()); //$NON-NLS-1$
- memberValuePairs.add(filePair);
- Annotation handlerChainAnnotation = AnnotationsCore.createNormalAnnotation(cu.getAST(),
- HandlerChain.class.getSimpleName(), memberValuePairs);
- AnnotationUtils.addAnnotation(type, handlerChainAnnotation);
- AnnotationUtils.addImport(type, HandlerChain.class.getCanonicalName());
- }
- JAXWSHandlerUtils.writeDocumentToFile(handlerChainPath, orderHandlerChainPage.getDocument());
- }
- };
- PlatformUI.getWorkbench().getProgressService().runInUI(getContainer(), workspaceModifyOperation, rule);
- } catch (InvocationTargetException ite) {
- JAXWSUIPlugin.log(ite);
- return false;
- } catch (InterruptedException ie) {
- JAXWSUIPlugin.log(ie);
- return false;
- }
- return true;
- }
-
- public void deleteFile(IPath filePath) {
- IFile handlerFile = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
- if (handlerFile.exists()) {
- try {
- handlerFile.delete(true, null);
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- }
- }
- }
-
- @Override
- public boolean performCancel() {
- if (fileCreated) {
- IPath filePath = type.getPackageFragment().getPath().append(new Path("handler-chain.xml")); //$NON-NLS-1$
- deleteFile(filePath);
- }
- return super.performCancel();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizard.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizard.java
deleted file mode 100644
index 8d5921e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizard.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.HandlerChain;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSHandlerUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
-public class NewJAXWSHandlerWizard extends Wizard implements INewWizard {
- private IWorkbench workbench;
- private IStructuredSelection selection;
-
- private NewJAXWSHandlerWizardPage handlerWizardPage;
- private OrderHandlerChainPage handlerOrderPage;
-
- @Override
- public void addPages() {
- if (handlerWizardPage == null) {
- handlerWizardPage= new NewJAXWSHandlerWizardPage();
- handlerWizardPage.init(getSelection());
- }
-
- if (handlerOrderPage == null) {
- handlerOrderPage = new OrderHandlerChainPage();
- }
- addPage(handlerWizardPage);
- addPage(handlerOrderPage);
- }
-
- public NewJAXWSHandlerWizard() {
- setWindowTitle(JAXWSUIMessages.JAXWS_HANDLER_WIZARD_TITLE);
- //TODO replace with dedicated handler wizban
- setDefaultPageImageDescriptor(JAXWSUIPlugin.getImageDescriptor("$nl$/icons/wizban/new_wiz.png")); //$NON-NLS-1$
- }
-
- @Override
- public IWizardPage getNextPage(IWizardPage page) {
- if (page == handlerWizardPage && handlerWizardPage.isConfigureHandlerChain() && handlerWizardPage.isEditHandlerChain()) {
- handlerOrderPage.setJavaProject(handlerWizardPage.getJavaProject());
- IPath handlerChainPath = new Path(handlerWizardPage.getExistingHandlerChainPath());
- handlerOrderPage.setInput(handlerChainPath);
- handlerOrderPage.addHandler(handlerWizardPage.getTypeName(), handlerWizardPage.getPackageText(), handlerWizardPage.getSelectedHandlerType());
- return handlerOrderPage;
- }
- return null;
- }
-
- @Override
- public boolean performFinish() {
- try {
-
- ISchedulingRule rule = null;
- Job job = Job.getJobManager().currentJob();
- if (job != null) {
- rule = job.getRule();
- } else {
- rule = ResourcesPlugin.getWorkspace().getRoot();
- }
- WorkspaceModifyOperation workspaceModifyOperation = new WorkspaceModifyOperation(rule) {
-
- @Override
- protected void execute(IProgressMonitor monitor) throws CoreException,
- InvocationTargetException, InterruptedException {
- handlerWizardPage.createType(monitor);
- IType type = handlerWizardPage.getCreatedType();
- if (handlerWizardPage.isConfigureHandlerChain()) {
- if (handlerWizardPage.isCreateHandlerChain()) {
- IPath handlerChainPath = new Path(handlerWizardPage.getNewHandlerChainPath());
- JAXWSHandlerUtils.createHandlerChainFile(handlerChainPath);
- JAXWSHandlerUtils.addHandlerToHandlerChain(handlerChainPath, type.getElementName(), type.getFullyQualifiedName());
- } else if (handlerWizardPage.isEditHandlerChain()) {
- IPath handlerChainPath = new Path(handlerWizardPage.getExistingHandlerChainPath());
- JAXWSHandlerUtils.writeDocumentToFile(handlerChainPath, handlerOrderPage.getDocument());
- }
- if (handlerWizardPage.isAssociateHandlerChain()) {
- String fullyQualifiedName = handlerWizardPage.getSelectedWebServicePath();
- IType webServiceType = handlerWizardPage.getJavaProject().findType(fullyQualifiedName);
- IPath handlerChainPath = new Path(handlerWizardPage.getHandlerChainPath());
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(handlerChainPath);
-
- URI relativeURI = URI.createPlatformResourceURI(handlerChainFile.getLocation().toOSString(),
- false).deresolve(
- URI.createPlatformResourceURI(webServiceType.getResource().getLocation().toOSString(),
- false));
-
- ICompilationUnit compilationUnit = webServiceType.getCompilationUnit();
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(compilationUnit);
- CompilationUnit cu = (CompilationUnit)parser.createAST(null);
-
- Annotation annotation = AnnotationUtils.getAnnotation(webServiceType, HandlerChain.class);
- if (annotation != null && annotation instanceof NormalAnnotation) {
- NormalAnnotation handlerChainAnnotation = (NormalAnnotation) annotation;
- MemberValuePair filePair = AnnotationUtils.getMemberValuePair(handlerChainAnnotation,
- "file"); //$NON-NLS-1$
- if (filePair != null) {
- StringLiteral file = AnnotationsCore.createStringLiteral(cu.getAST(),
- relativeURI.toFileString());
- AnnotationUtils.updateMemberValuePair(filePair, file);
- }
- } else {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- MemberValuePair filePair = AnnotationsCore.createStringMemberValuePair(cu.getAST(),
- "file", relativeURI.toFileString()); //$NON-NLS-1$
- memberValuePairs.add(filePair);
- Annotation handlerChainAnnotation = AnnotationsCore.createNormalAnnotation(cu.getAST(),
- HandlerChain.class.getSimpleName(), memberValuePairs);
- AnnotationUtils.addAnnotation(webServiceType, handlerChainAnnotation);
- AnnotationUtils.addImport(webServiceType, HandlerChain.class.getCanonicalName());
- }
- }
- }
- }
-
- };
- PlatformUI.getWorkbench().getProgressService().runInUI(getContainer(), workspaceModifyOperation, rule);
- } catch (InvocationTargetException ite) {
- JAXWSUIPlugin.log(ite);
- return false;
- } catch (InterruptedException ie) {
- JAXWSUIPlugin.log(ie);
- return false;
- }
-
- IResource resource= handlerWizardPage.getModifiedResource();
- if (resource != null) {
- BasicNewResourceWizard.selectAndReveal(resource, workbench.getActiveWorkbenchWindow());
- openResource((IFile) resource);
- }
-
- return true;
- }
-
-
- protected void openResource(final IFile resource) {
- final IWorkbenchPage activePage= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- if (activePage != null) {
- final Display display= getShell().getDisplay();
- if (display != null) {
- display.asyncExec(new Runnable() {
- public void run() {
- try {
- IDE.openEditor(activePage, resource, true);
- } catch (PartInitException e) {
- JAXWSUIPlugin.log(e);
- }
- }
- });
- }
- }
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- this.workbench = workbench;
- this.selection = selection;
- }
-
- private IStructuredSelection getSelection() {
- return selection;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizardPage.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizardPage.java
deleted file mode 100644
index c3e7710..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizardPage.java
+++ /dev/null
@@ -1,652 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.dialogs.HandlerChainSelectionDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.dialogs.NewHandlerChainDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.filters.NewHandlerChainViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-public class NewJAXWSHandlerWizardPage extends NewTypeWizardPage {
- private List<String> logicalHandlerList = new ArrayList<String>();
- private List<String> soapHandlerList = new ArrayList<String>();
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private IStatus superClassImplementsStatus = Status.OK_STATUS;
- private IStatus addNewHandlerChainStatus = Status.OK_STATUS;
- private IStatus editHandlerChainStatus = Status.OK_STATUS;
- private IStatus associateWebServiceStatus = Status.OK_STATUS;
-
- private Combo handlerTypeCombo;
- private Button configureHandlerChainButton;
- private Button createHandlerChainButton;
- private Text newHandlerChainText;
- private Button browseNewHandlerChainButton;
-
- private Button editHandlerChainButton;
- private Text exisitingHandlerChainText;
- private Button browseExistingHandlerChainButton;
-
- private Button associateHandlerChainButton;
- private Text webServiceText;
- private Button browseWebServiceButton;
-
- public NewJAXWSHandlerWizardPage() {
- super(true, "create.new.handler.chain.page"); //$NON-NLS-1$
- setTitle(JAXWSUIMessages.JAXWS_HANDLER_WIZARD_PAGE_TITLE);
- setDescription(JAXWSUIMessages.JAXWS_HANDLER_WIZARD_PAGE_DESCRIPTION);
- logicalHandlerList.add("javax.xml.ws.handler.LogicalHandler<javax.xml.ws.handler.LogicalMessageContext>"); //$NON-NLS-1$
- soapHandlerList.add("javax.xml.ws.handler.soap.SOAPHandler<javax.xml.ws.handler.soap.SOAPMessageContext>"); //$NON-NLS-1$
- }
-
- public void init(IStructuredSelection selection) {
- IJavaElement javaElement = getInitialJavaElement(selection);
- initContainerPage(javaElement);
- initTypePage(javaElement);
- doStatusUpdate();
- }
-
- public void createControl(Composite parent) {
- initializeDialogUnits(parent);
-
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setFont(parent.getFont());
-
- int nColumns = 4;
-
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns= nColumns;
- composite.setLayout(gridLayout);
-
- createContainerControls(composite, nColumns);
- createPackageControls(composite, nColumns);
-
- createSeparator(composite, nColumns);
-
- createTypeNameControls(composite, nColumns);
- createModifierControls(composite, nColumns);
-
- createSuperClassControls(composite, nColumns);
-
- Label handlerTypeLabel = new Label(composite, SWT.NONE);
- handlerTypeLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_TYPE);
-
- handlerTypeCombo = new Combo(composite, SWT.READ_ONLY | SWT.BORDER);
-
- GridData gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
- gridData.horizontalSpan = 2;
- handlerTypeCombo.setLayoutData(gridData);
- handlerTypeCombo.add(JAXWSUIMessages.JAXWS_LOGICAL_HANDLER);
- handlerTypeCombo.add(JAXWSUIMessages.JAXWS_SOAP_HANDLER);
- handlerTypeCombo.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Combo combo = (Combo) e.widget;
- if (combo.getSelectionIndex() == 0) {
- setSuperInterfaces(logicalHandlerList, true);
- } else if (combo.getSelectionIndex() == 1) {
- setSuperInterfaces(soapHandlerList, true);
- }
- }
- });
-
- Group configurationGroup = new Group(composite, SWT.SHADOW_NONE);
- configurationGroup.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION);
- gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- configurationGroup.setLayout(gridLayout);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 4;
- configurationGroup.setLayoutData(gridData);
-
- configureHandlerChainButton = new Button(configurationGroup, SWT.CHECK);
- configureHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_ADD);
- configureHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.widget;
- if (button.getSelection()) {
- createHandlerChainButton.setEnabled(true);
- editHandlerChainButton.setEnabled(true);
- associateHandlerChainButton.setEnabled(true);
- enableNewHandlerChainFileWidgets(createHandlerChainButton.getSelection());
- enableEditHandlerChainFileWidgets(editHandlerChainButton.getSelection());
- enableWebServiceWidgets(associateHandlerChainButton.getSelection());
- } else {
- createHandlerChainButton.setEnabled(false);
- editHandlerChainButton.setEnabled(false);
- associateHandlerChainButton.setEnabled(false);
- enableNewHandlerChainFileWidgets(false);
- enableEditHandlerChainFileWidgets(false);
- enableWebServiceWidgets(false);
- }
- updateConfigureHandlerStatus();
- }
- });
-
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 4;
- configureHandlerChainButton.setLayoutData(gridData);
-
- Group innerGroup = new Group(configurationGroup, SWT.SHADOW_NONE);
- gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- innerGroup.setLayout(gridLayout);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 4;
- innerGroup.setLayoutData(gridData);
-
- createHandlerChainButton = new Button(innerGroup, SWT.RADIO);
- createHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- createHandlerChainButton.setLayoutData(gridData);
- createHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.widget;
- enableNewHandlerChainFileWidgets(button.getSelection());
- enableEditHandlerChainFileWidgets(!button.getSelection());
- updateConfigureHandlerStatus();
- }
-
- });
-
- Label createNewHandlerLabel = new Label(innerGroup, SWT.NONE);
- createNewHandlerLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_FILE_PATH);
-
- newHandlerChainText = new Text(innerGroup, SWT.SINGLE | SWT.BORDER);
- newHandlerChainText.setFont(innerGroup.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- newHandlerChainText.setLayoutData(gridData);
-
- newHandlerChainText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- browseNewHandlerChainButton = new Button(innerGroup, SWT.PUSH);
- browseNewHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE);
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseNewHandlerChainButton.setLayoutData(gridData);
- browseNewHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- NewHandlerChainDialog dialog = new NewHandlerChainDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- dialog.addFilter(new NewHandlerChainViewerFilter(getJavaProject(), true, true));
- if (dialog.open() == Window.OK) {
- newHandlerChainText.setText(dialog.getFilePath());
- updateConfigureHandlerStatus();
- }
- }
- });
-
- editHandlerChainButton = new Button(innerGroup, SWT.RADIO);
- editHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- editHandlerChainButton.setLayoutData(gridData);
-
- Label addToHandlerLabel = new Label(innerGroup, SWT.NONE);
- addToHandlerLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_FILE_PATH);
-
- editHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- exisitingHandlerChainText = new Text(innerGroup, SWT.SINGLE | SWT.BORDER);
- exisitingHandlerChainText.setFont(composite.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- exisitingHandlerChainText.setLayoutData(gridData);
- exisitingHandlerChainText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- browseExistingHandlerChainButton = new Button(innerGroup, SWT.PUSH);
- browseExistingHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- browseExistingHandlerChainButton.setLayoutData(gridData);
-
- browseExistingHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- HandlerChainSelectionDialog dialog = new HandlerChainSelectionDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
-
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- dialog.addFilter(new NewHandlerChainViewerFilter(getJavaProject(), false, true));
-
- if (dialog.open() == Window.OK) {
- Object[] result = dialog.getResult();
- IResource resource = (IResource) result[0];
- exisitingHandlerChainText.setText(resource.getFullPath().toOSString());
- updateConfigureHandlerStatus();
- }
- }
- });
-
- createSeparator(innerGroup, nColumns);
-
- associateHandlerChainButton = new Button(innerGroup, SWT.CHECK);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- associateHandlerChainButton.setLayoutData(gridData);
- associateHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_ASSOCIATE);
- associateHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.widget;
- enableWebServiceWidgets(button.getSelection());
- updateConfigureHandlerStatus();
- }
-
- });
-
- Label webServiceLabel = new Label(innerGroup, SWT.NONE);
- webServiceLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WEB_SERVICE);
-
- webServiceText = new Text(innerGroup, SWT.SINGLE | SWT.BORDER);
- webServiceText.setFont(composite.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, false, false);
- gridData.horizontalSpan = 2;
- webServiceText.setLayoutData(gridData);
- webServiceText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- browseWebServiceButton = new Button(innerGroup, SWT.PUSH);
- browseWebServiceButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- browseWebServiceButton.setLayoutData(gridData);
-
- browseWebServiceButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- dialog.setTitle(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_TITLE);
- dialog.setMessage(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_DESCRIPTION);
- dialog.setAllowMultiple(false);
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
-
- dialog.addFilter(new NewHandlerChainViewerFilter(getJavaProject(), true, false));
- dialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) selection[0];
- if (AnnotationUtils.getAnnotation(compilationUnit.findPrimaryType(), WebService.class)
- != null) {
- return ok_status;
- } else {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_INVALID);
- }
- }
- }
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- });
-
- if (dialog.open() == Window.OK) {
- ICompilationUnit selectedCompilationUnit = (ICompilationUnit) dialog.getFirstResult();
- webServiceText.setText(selectedCompilationUnit.findPrimaryType().getFullyQualifiedName());
- updateConfigureHandlerStatus();
- }
-
- }
- });
-
- composite.pack();
- setControl(composite);
- Dialog.applyDialogFont(composite);
-
- createHandlerChainButton.setSelection(true);
- createHandlerChainButton.setEnabled(false);
- editHandlerChainButton.setEnabled(false);
- associateHandlerChainButton.setEnabled(false);
- enableNewHandlerChainFileWidgets(false);
- enableEditHandlerChainFileWidgets(false);
- enableWebServiceWidgets(false);
- }
-
- public boolean isConfigureHandlerChain() {
- return configureHandlerChainButton.getSelection();
- }
-
- public boolean isCreateHandlerChain() {
- return createHandlerChainButton.getSelection();
- }
-
- public boolean isEditHandlerChain() {
- return editHandlerChainButton.getSelection();
- }
-
- public String getSelectedHandlerType() {
- return handlerTypeCombo.getText();
- }
-
- public String getNewHandlerChainPath() {
- return newHandlerChainText.getText();
- }
-
- public String getExistingHandlerChainPath() {
- return exisitingHandlerChainText.getText();
- }
-
- public String getHandlerChainPath() {
- if (isCreateHandlerChain()) {
- return getNewHandlerChainPath();
- } else if (isEditHandlerChain()) {
- return getExistingHandlerChainPath();
- }
- return "";
- }
-
- public boolean isAssociateHandlerChain() {
- return associateHandlerChainButton.getSelection();
- }
-
- public String getSelectedWebServicePath() {
- return webServiceText.getText();
- }
-
- private void enableEditHandlerChainFileWidgets(boolean enable) {
- exisitingHandlerChainText.setEnabled(enable);
- browseExistingHandlerChainButton.setEnabled(enable);
- }
-
- private void enableNewHandlerChainFileWidgets(boolean enable) {
- newHandlerChainText.setEnabled(enable);
- browseNewHandlerChainButton.setEnabled(enable);
- }
-
- private void enableWebServiceWidgets(boolean enable) {
- webServiceText.setEnabled(enable);
- browseWebServiceButton.setEnabled(enable);
- }
-
- private void doStatusUpdate() {
- IStatus[] status = new IStatus[] {
- fContainerStatus,
- fPackageStatus,
- fTypeNameStatus,
- fSuperClassStatus,
- fSuperInterfacesStatus,
- superClassImplementsStatus,
- addNewHandlerChainStatus,
- editHandlerChainStatus,
- associateWebServiceStatus
- };
-
- updateStatus(status);
- }
-
- private void updateConfigureHandlerStatus() {
- try {
- validateNewHandlerChainField();
- validateExistingHandlerChainField();
- validateWebServiceField();
- doStatusUpdate();
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
-
- private IStatus validateNewHandlerChainField() throws JavaModelException {
- if (isConfigureHandlerChain() && isCreateHandlerChain()) {
- editHandlerChainStatus = ok_status;
- String newHandlerChainPath = getNewHandlerChainPath().trim();
- if (newHandlerChainPath.length() == 0) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_NEW_HANDLER_PATH_EMTPY);
- }
-
- if (!newHandlerChainPath.endsWith(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IPath path = new Path(newHandlerChainPath);
- if (path.segmentCount() >= 2) {
- String[] segmenets = path.segments();
- if (!segmenets[0].equals(getJavaProject().getElementName())) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- getJavaProject().getElementName()));
- }
- boolean inSourceFolder = false;
- IPackageFragmentRoot[] packageFragmentRoots = getJavaProject().getPackageFragmentRoots();
- for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
- if (segmenets[1].equals(packageFragmentRoot.getElementName())) {
- inSourceFolder = true;
- break;
- }
- }
- if (!inSourceFolder) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- getJavaProject().getElementName()));
- }
- if (path.lastSegment() != null && path.lastSegment().equals(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME);
- }
- } else {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- getJavaProject().getElementName()));
- }
-
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
- if (res != null) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS,
- res.getName()));
- }
-
- return addNewHandlerChainStatus = ok_status;
- } else {
- return addNewHandlerChainStatus = ok_status;
- }
- }
-
- private IStatus validateExistingHandlerChainField() {
- if (isConfigureHandlerChain() && isEditHandlerChain()) {
- addNewHandlerChainStatus = ok_status;
- String existingHandlerChainPath = getExistingHandlerChainPath().trim();
- if (existingHandlerChainPath.length() == 0) {
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EXISTING_HANDLER_PATH_EMTPY);
- }
-
- if (!existingHandlerChainPath.endsWith(".xml")) { //$NON-NLS-1$
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(existingHandlerChainPath);
- if (path.segmentCount() > 1 && path.segment(0).equals(getJavaProject().getElementName())
- && workspace.getRoot().getFile(path).exists()) {
- return editHandlerChainStatus = ok_status;
- } else {
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND,
- existingHandlerChainPath));
- }
- } else {
- return editHandlerChainStatus = ok_status;
- }
- }
-
- private IStatus validateWebServiceField() throws JavaModelException {
- if (isConfigureHandlerChain() && isAssociateHandlerChain()) {
- String webServicePath = getSelectedWebServicePath().trim();
- if (webServicePath.length() == 0) {
- return associateWebServiceStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_PATH_EMTPY);
- } else if (getJavaProject().findType(webServicePath) == null){
- return associateWebServiceStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_NOT_FOUND);
- } else {
- return associateWebServiceStatus = ok_status;
- }
- } else {
- return associateWebServiceStatus = ok_status;
- }
- }
-
- @Override
- protected void handleFieldChanged(String fieldName) {
- super.handleFieldChanged(fieldName);
- if (fieldName.equals(SUPER) || fieldName.equals(INTERFACES)) {
- try {
- if (getSuperInterfaces().size() == 0 && fSuperClassStatus.isOK()) {
- IType type = getJavaProject().findType(getSuperClass());
- if (type != null) {
- List<String> interfaceNames = new ArrayList<String>();
- List<String> superInterfaceNames = Arrays.asList(type.getSuperInterfaceNames());
- for (String interfaceName : superInterfaceNames) {
- interfaceNames.add(Signature.getTypeErasure(interfaceName));
- }
-
- if (interfaceNames.contains("javax.xml.ws.handler.soap.SOAPHandler") || //$NON-NLS-1$
- interfaceNames.contains("javax.xml.ws.handler.LogicalHandler")) { //$NON-NLS-1$
- superClassImplementsStatus = ok_status;
- } else {
- superClassImplementsStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_EXTEND_IMPLEMENT_HANDLER);
- }
- }
- } else {
- superClassImplementsStatus = Status.OK_STATUS;
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme);
- }
- }
-
- doStatusUpdate();
- }
-
- @Override
- protected IStatus superInterfacesChanged() {
- IStatus status = Status.OK_STATUS;
-
- IPackageFragmentRoot root = getPackageFragmentRoot();
-
- if (root != null) {
- String interfaceName = "javax.xml.ws.handler.LogicalHandler"; //$NON-NLS-1$
- try {
- IType type = root.getJavaProject().findType(interfaceName);
- if (type == null) {
- status = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_LIBRARY_CLASSPATH);
- return status;
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return status;
- }
-
- @Override
- protected void createTypeMembers(IType newType, final ImportsManager imports, IProgressMonitor monitor)
- throws CoreException {
- createInheritedMethods(newType, false, true, imports, new SubProgressMonitor(monitor, 1));
- if (monitor != null) {
- monitor.done();
- }
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/OrderHandlerChainPage.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/OrderHandlerChainPage.java
deleted file mode 100644
index bcaaaa6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/OrderHandlerChainPage.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.ParameterizedType;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSHandlerUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.filters.NewHandlerChainViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-
-public class OrderHandlerChainPage extends WizardPage {
- private static final String LOGICAL_HANDLER = "javax.xml.ws.handler.LogicalHandler"; //$NON-NLS-1$
- private static final String SOAP_HANDLER = "javax.xml.ws.handler.soap.SOAPHandler"; //$NON-NLS-1$
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private TreeViewer treeViewer;
-
- private Document doc;
- private Element root;
-
- private IPath handlerChainPath;
- private IJavaProject javaProject;
-
- private boolean configure;
-
- private String newHandlerClassName;
- private String newHandlerType;
-
- public OrderHandlerChainPage() {
- super("order.handlerchain.wizard.page"); //$NON-NLS-1$
- setTitle(JAXWSUIMessages.JAXWS_ORDER_HANDLER_WIZARD_PAGE_TITLE);
- setDescription(JAXWSUIMessages.JAXWS_ORDER_HANDLER_WIZARD_PAGE_DESCRIPTION);
- }
-
- public OrderHandlerChainPage(IPath handlerChainPath, IJavaProject javaProject) {
- this();
- this.handlerChainPath = handlerChainPath;
- this.javaProject = javaProject;
- this.configure = true;
- }
-
- public Document getDocument() {
- return doc;
- }
-
- public void refreshViewer() {
- treeViewer.refresh();
- }
-
- public void setSelection(ISelection selection) {
- treeViewer.setSelection(selection, true);
- }
-
- public void createControl(Composite parent) {
- final Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(2, false);
- composite.setLayout(gridLayout);
-
- treeViewer = new TreeViewer(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- treeViewer.getTree().setHeaderVisible(true);
- treeViewer.getTree().setLinesVisible(true);
- treeViewer.setContentProvider(new HandlerChainContentProvider());
-
- TreeViewerColumn nameViewerColumn = new TreeViewerColumn(treeViewer, SWT.LEFT);
- TreeColumn nameColumn = nameViewerColumn.getColumn();
- nameColumn.setWidth(200);
- nameColumn.setMoveable(false);
- nameColumn.setText(JAXWSUIMessages.JAXWS_HANDLER_NAME_COLUMN);
-
- nameViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER)) {
- Element handlerNameElement = node.getChild(JAXWSHandlerUtils.HANDLER_NAME, JAXWSHandlerUtils.JAVAEE_NS);
- if (handlerNameElement != null) {
- return handlerNameElement.getText().trim();
- }
- }
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER_CHAIN)) {
- return node.getName();
- }
- }
- return null;
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof Element) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(
- org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
- }
- return null;
- }
- });
-
- TreeViewerColumn classViewerColumn = new TreeViewerColumn(treeViewer, SWT.LEFT);
- TreeColumn classColumn = classViewerColumn.getColumn();
- classColumn.setWidth(200);
- classColumn.setMoveable(false);
- classColumn.setText(JAXWSUIMessages.JAXWS_HANDLER_CLASS_COLUMN);
-
- classViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER)) {
- Element handlerNameElement = node.getChild(JAXWSHandlerUtils.HANDLER_CLASS, JAXWSHandlerUtils.JAVAEE_NS);
- if (handlerNameElement != null) {
- return handlerNameElement.getText().trim();
- }
- }
- }
- return null;
- }
- });
-
- TreeViewerColumn typeViewerColumn = new TreeViewerColumn(treeViewer, SWT.LEFT);
- TreeColumn typeColumn = typeViewerColumn.getColumn();
- typeColumn.setWidth(100);
- typeColumn.setMoveable(false);
- typeColumn.setText(JAXWSUIMessages.JAXWS_HANDLER_TYPE_COLUMN);
-
- typeViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER)) {
- Element handlerClassElement = node.getChild(JAXWSHandlerUtils.HANDLER_CLASS, JAXWSHandlerUtils.JAVAEE_NS);
- if (handlerClassElement != null) {
- if (newHandlerClassName != null && newHandlerClassName.equals(handlerClassElement.getValue().trim())) {
- return newHandlerType;
- }
- try {
- IType handler = javaProject.findType(handlerClassElement.getText().trim());
- if (handler != null) {
- ITypeHierarchy typeHierarchy = handler.newTypeHierarchy(javaProject, null);
- IType[] allInterfaces = typeHierarchy.getAllInterfaces();
- for (IType aInterface : allInterfaces) {
- if (aInterface.getFullyQualifiedName().equals(LOGICAL_HANDLER)) {
- return JAXWSUIMessages.JAXWS_LOGICAL;
- }
- if (aInterface.getFullyQualifiedName().equals(SOAP_HANDLER)) {
- return JAXWSUIMessages.JAXWS_PROTOCOL;
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- }
- }
- return null;
- }
- });
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.verticalSpan = 6;
- treeViewer.getTree().setLayoutData(gridData);
-
- if (configure) {
- Button addButton = new Button(composite, SWT.PUSH);
- addButton.setText(JAXWSUIMessages.JAXWS_HANDLER_ADD);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- addButton.setLayoutData(gridData);
- addButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- dialog.setTitle(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_TITLE);
- dialog.setMessage(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_DESCRIPTION);
- dialog.setAllowMultiple(false);
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
-
- dialog.addFilter(new NewHandlerChainViewerFilter(javaProject, true, false));
- dialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) selection[0];
- if (isHandler(compilationUnit)) {
- return ok_status;
- } else {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_INVALID);
- }
- }
- }
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- });
-
- if (dialog.open() == Window.OK) {
- ICompilationUnit selectedHandler = (ICompilationUnit) dialog.getFirstResult();
- addHandler(selectedHandler.findPrimaryType().getElementName(),
- selectedHandler.findPrimaryType().getPackageFragment().getElementName());
- }
-
- }
- });
-
- Button removeButton = new Button(composite, SWT.PUSH);
- removeButton.setText(JAXWSUIMessages.JAXWS_HANDLER_REMOVE);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- removeButton.setLayoutData(gridData);
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- if (!selection.isEmpty()) {
- Element selected = (Element) selection.getFirstElement();
- if (selected.getName().equals(JAXWSHandlerUtils.HANDLER)) {
- Element handlerChain = (Element) selected.getParent();
- if (handlerChain != null) {
- handlerChain.removeContent(selected);
- treeViewer.refresh();
- }
- }
- }
- }
- });
- }
-
- Button moveUpButton = new Button(composite, SWT.PUSH);
- moveUpButton.setText(JAXWSUIMessages.JAXWS_HANDLER_MOVE_UP);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- moveUpButton.setLayoutData(gridData);
- moveUpButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- @SuppressWarnings("unchecked")
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- if (!selection.isEmpty()) {
- Element selected = (Element) selection.getFirstElement();
- Element parent = (Element) selected.getParent();
- List children = parent.getChildren();
- int index = children.indexOf(selected);
- if (index > 0) {
- children.remove(selected);
- children.add(index - 1, selected);
- } else if (index == 0) {
- Element root = (Element) parent.getParent();
- List handlerChains = root.getChildren();
- int topIndex = handlerChains.indexOf(parent);
- if (topIndex > 0 && handlerChains.get(topIndex - 1) != null) {
- children.remove(selected);
- Element topChild = (Element) handlerChains.get(topIndex - 1);
- topChild.getChildren().add(topChild.getChildren().size(), selected);
- }
- }
- treeViewer.refresh();
- }
- }
- });
-
- Button moveDownButton = new Button(composite, SWT.PUSH);
- moveDownButton.setText(JAXWSUIMessages.JAXWS_HANDLER_MOVE_DOWN);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- moveDownButton.setLayoutData(gridData);
- moveDownButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- @SuppressWarnings("unchecked")
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- if (!selection.isEmpty()) {
- Element selected = (Element) selection.getFirstElement();
- Element parent = (Element) selected.getParent();
- List children = parent.getChildren();
- int index = children.indexOf(selected);
- if (index >= 0 && index < children.size() - 1) {
- children.remove(selected);
- children.add(index + 1, selected);
- } else if (index == children.size() - 1) {
- Element root = (Element) parent.getParent();
- List handlerChains = root.getChildren();
- int hIndex = handlerChains.indexOf(parent);
- if (hIndex >= 0 && hIndex < handlerChains.size() - 1 && handlerChains.get(hIndex + 1) != null) {
- children.remove(selected);
- Element topChild = (Element) handlerChains.get(hIndex + 1);
- topChild.getChildren().add(0, selected);
- }
- }
- treeViewer.refresh();
- }
- }
- });
-
- if (handlerChainPath != null) {
- setInput(handlerChainPath);
- }
-
- treeViewer.expandAll();
-
- composite.pack();
- setControl(composite);
- Dialog.applyDialogFont(composite);
- }
-
-
- @Override
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (visible) {
- setInput(handlerChainPath);
- }
- }
-
- public void setHandlerChainPath(IPath handlerChainPath) {
- this.handlerChainPath = handlerChainPath;
- }
-
- private boolean isHandler(ICompilationUnit source) {
- final List<String> interfaces = new ArrayList<String>();
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(source);
- parser.setResolveBindings(true);
- CompilationUnit compilationUnit = (CompilationUnit) parser.createAST(null);
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(TypeDeclaration typeDeclaration) {
- @SuppressWarnings("unchecked")
- List superInterfaces = typeDeclaration.superInterfaceTypes();
- for (Object object : superInterfaces) {
- if (object instanceof ParameterizedType) {
- ParameterizedType parameterizedType = (ParameterizedType) object;
- ITypeBinding binding = parameterizedType.resolveBinding();
- if (binding != null) {
- String qualifiedName = binding.getErasure().getQualifiedName();
- if (qualifiedName.equals(LOGICAL_HANDLER) || qualifiedName.equals(SOAP_HANDLER)) {
- interfaces.add(qualifiedName);
- break;
- }
- }
- }
- }
- return false;
- }
- });
- return interfaces.size() > 0;
- }
-
- public void setInput(IPath handlerChainPath) {
- if (handlerChainPath == null) {
- return;
- }
- if (!handlerChainPath.isEmpty()) {
- try {
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(handlerChainPath);
- if (handlerChainFile.getFileExtension().equals("xml")) { //$NON-NLS-1$
- if (handlerChainFile.exists() && JAXWSHandlerUtils.isHandlerChainFile(handlerChainFile)) {
- FileInputStream handlerInputStream = new FileInputStream(handlerChainFile.getLocation().toFile());
- SAXBuilder builder = new SAXBuilder();
- doc = builder.build(handlerInputStream);
- root = doc.getRootElement();
- treeViewer.setInput(root);
- treeViewer.expandAll();
- } else {
- JAXWSHandlerUtils.createHandlerChainFile(handlerChainPath);
- setInput(handlerChainPath);
- }
- }
- } catch (IOException ioe) {
- JAXWSUIPlugin.log(ioe);
- } catch (JDOMException jdome) {
- JAXWSUIPlugin.log(jdome);
- }
- }
- }
-
- public void setJavaProject(IJavaProject javaProject) {
- this.javaProject = javaProject;
- }
-
- public void addHandler(String newHandlerName, String packageName) {
- if (root != null) {
- Element handlerChainElement = root.getChild(JAXWSHandlerUtils.HANDLER_CHAIN, JAXWSHandlerUtils.JAVAEE_NS);
- if (handlerChainElement == null) {
- handlerChainElement = new Element(JAXWSHandlerUtils.HANDLER_CHAIN, JAXWSHandlerUtils.JAVAEE_NS);
- root.addContent(handlerChainElement);
- }
- Element handlerElement = new Element(JAXWSHandlerUtils.HANDLER, JAXWSHandlerUtils.JAVAEE_NS);
-
- Element handlerNameElement = new Element(JAXWSHandlerUtils.HANDLER_NAME, JAXWSHandlerUtils.JAVAEE_NS);
- handlerNameElement.setText(newHandlerName);
-
- Element handlerClassElement = new Element(JAXWSHandlerUtils.HANDLER_CLASS, JAXWSHandlerUtils.JAVAEE_NS);
- if (packageName.trim().length() > 0) {
- handlerClassElement.setText(packageName + "." + newHandlerName);
- } else {
- handlerClassElement.setText(newHandlerName);
- }
-
- handlerElement.addContent(handlerNameElement);
- handlerElement.addContent(handlerClassElement);
- handlerChainElement.addContent(handlerElement);
- treeViewer.refresh();
- treeViewer.setSelection(new StructuredSelection(handlerElement));
- }
- }
-
- public void addHandler(String newHandlerName, String packageName, String newHandlerType) {
- addHandler(newHandlerName, packageName);
- this.newHandlerClassName = packageName + "." + newHandlerName;
- this.newHandlerType = newHandlerType;
- if (newHandlerType.equals(JAXWSUIMessages.JAXWS_LOGICAL_HANDLER)) {
- this.newHandlerType = JAXWSUIMessages.JAXWS_LOGICAL;
- } else if (newHandlerType.equals(JAXWSUIMessages.JAXWS_SOAP_HANDLER)) {
- this.newHandlerType = JAXWSUIMessages.JAXWS_PROTOCOL;
- }
- }
-
- private class HandlerChainContentProvider implements ITreeContentProvider {
-
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof Element) {
- Element element = (Element) parentElement;
- return element.getChildren().toArray();
- }
- return new Object[] {};
- }
-
- public Object getParent(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- return node.getParent();
- }
- return null;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER_CHAIN)) {
- return node.getChildren().size() > 0;
- }
- }
- return false;
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Element) {
- Element element = (Element) inputElement;
- return element.getChildren().toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath b/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/.project b/bundles/org.eclipse.jst.ws.jaxws.utils/.project
deleted file mode 100755
index ca99091..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.utils</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/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-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.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF
deleted file mode 100755
index 84b2421..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.utils;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.text,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.wst.common.project.facet.core
-Export-Package: org.eclipse.jst.ws.jaxws.utils,
- org.eclipse.jst.ws.jaxws.utils.annotations,
- org.eclipse.jst.ws.jaxws.utils.clazz,
- org.eclipse.jst.ws.jaxws.utils.dom.validation,
- org.eclipse.jst.ws.jaxws.utils.exception,
- org.eclipse.jst.ws.jaxws.utils.facets,
- org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl,
- org.eclipse.jst.ws.jaxws.utils.internal.text;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration.tests",
- org.eclipse.jst.ws.jaxws.utils.logging,
- org.eclipse.jst.ws.jaxws.utils.resources
-Bundle-Activator: org.eclipse.jst.ws.jaxws.utils.internal.plugin.JaxwsUtilsPlugin
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/about.html b/bundles/org.eclipse.jst.ws.jaxws.utils/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</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
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/build.properties b/bundles/org.eclipse.jst.ws.jaxws.utils/build.properties
deleted file mode 100755
index 3aae249..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.html,\
- plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.properties
deleted file mode 100755
index 54b40da..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=UtilsPlugin (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml
deleted file mode 100755
index 0029309..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
- Copyright (c) 2009 by SAP AG, Walldorf.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- SAP AG - initial API and implementation
- -->
-
-<plugin>
- <extension
- point="org.eclipse.ui.startup">
- <startup></startup>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java
deleted file mode 100755
index 7f13b8e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import java.text.MessageFormat;
-
-/**
- * Contains checks frequently applied on parameters.
- *
- * @author Joerg Dehmel
- */
-public final class ContractChecker
-{
- private ContractChecker()
- {
- // prevent instantiation from outside
- }
-
- /** Checks if the given parameter value is null and reports an <code>NullPointerException</code>
- * in this case.
- * @param paramValue the value to be checked
- * @param paramName name of the parameter, used to report the problem to the user
- * @throws NullPointerException thrown either the paramValue or paramName is null */
- public static void nullCheckParam(final Object paramValue, final String paramName)
- {
- if (paramName == null)
- {
- throw new NullPointerException("paramName must not be null"); //$NON-NLS-1$
- }
- if (paramValue == null)
- {
- throw new NullPointerException(paramName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given parameter value is null and reports an <code>NullPointerException</code>
- * in this case.
- * @param paramValue the value to be checked
- * @throws NullPointerException thrown if the paramValue is null */
- public static void nullCheckParam(final Object paramValue)
- {
- if (paramValue == null)
- {
- throw new NullPointerException("paramValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks if the given field value is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param fieldValue the value to be checked
- * @param fieldName name of the field, used to report the problem to the user
- * @throws NullPointerException thrown if the fieldName is null
- * @throws IllegalStateException thrown if the fieldValue is null */
- public static void nullCheckField(final Object fieldValue, final String fieldName)
- {
- if (fieldName == null)
- {
- throw new NullPointerException("fieldName must not be null"); //$NON-NLS-1$
- }
- if (fieldValue == null)
- {
- throw new IllegalStateException(fieldName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given field value is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param fieldValue the value to be checked
- * @throws IllegalStateException thrown if the fieldValue is null */
- public static void nullCheckField(final Object fieldValue)
- {
- if (fieldValue == null)
- {
- throw new IllegalStateException("fieldValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given value of a local variable is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param varValue the value to be checked
- * @param varName name of the local variable, used to report the problem to the user
- * @throws NullPointerException thrown if the varName is null
- * @throws IllegalStateException thrown if the varValue is null */
- public static void nullCheckVariable(final Object varValue, final String varName)
- {
- if (varName == null)
- {
- throw new NullPointerException("varName must not be null"); //$NON-NLS-1$
- }
- if (varValue == null)
- {
- throw new IllegalStateException(varName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given value of a local variable is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param varValue the value to be checked
- * @throws IllegalStateException thrown if the varValue is null */
- public static void nullCheckVariable(final Object varValue)
- {
- if (varValue == null)
- {
- throw new IllegalStateException("varValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /**
- * This method checks if <code>param</code> is <code>null</code> or empty string.
- * @param param
- * @param varName
- * @throws NullPointerException in case <code>param</code> is <code>null</code>
- * @throws IllegalArgumentException in case <code>param</code> is empty string or contains only
- * white space characters
- */
- public static void emptyStringCheckParam(final String param, final String varName)
- {
- nullCheckParam(param, varName);
-
- if (param.trim().length() == 0) {
- throw new IllegalArgumentException(MessageFormat.format("Parameter {0} is empty string or contains only white spaces", varName)); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java
deleted file mode 100755
index 5edde7e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import org.eclipse.jdt.core.IType;
-
-/**
- * Utility that contains JAX-WS releated functionality
- *
- * @author Danail Branekov
- *
- */
-public class JaxWsUtils
-{
- private static final String BEAN_SUFFIX = "Bean"; //$NON-NLS-1$
- private static final String PORT_SUFFIX = "Port"; //$NON-NLS-1$
- private static final String SERVICE_SUFFIX = "Service"; //$NON-NLS-1$
-
- private JaxWsUtils()
- {
- // hide default constructor
- }
-
- /**
- * An utility method for composing a default target namespace for JaxWs customization
- * out of a package name.
- * Algorithm:
- * <li>In case the package has 0 fragment (default package) the result would be http:///</li>
- * <li>In case the package has 1 fragment the result would be http://fragment1/</li>
- * <li>In case the package has 2 fragments the result would be http://fragment2.fragment1/</li>
- * <li>In case the package has more than 2 fragments the result would be http://fragment2.fragment1/fragment3/fragment4/.../fragmentn/</li>
- * @param packageName Name of the package
- * @return the composed namespace
- * @thorws NullPointerException when package name specified is null
- */
- public static String composeJaxWsTargetNamespaceByPackage(String packageName)
- {
- if(packageName == null)
- {
- throw new NullPointerException("Package name cannot be null"); //$NON-NLS-1$
- }
-
- String[] pkgFragments = packageName.split("\\."); //$NON-NLS-1$
-
- if(pkgFragments.length > 1)
- {
- // reverse the first two fragments in case there are at least two fragments available
- String frag0 = pkgFragments[0];
- pkgFragments[0] = pkgFragments[1];
- pkgFragments[1] = frag0;
- }
-
- StringBuilder result = new StringBuilder("http://"); //$NON-NLS-1$
- for (int i = 0; i < pkgFragments.length; i++)
- {
- result.append(pkgFragments[i]);
- result.append(i==0 && pkgFragments.length>1 ? "." : "/"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return result.toString();
- }
-
- /**
- * Same as composeJaxWsTargetNamespaceByPackage() but first extracts the package out of class
- * fully qualified name
- * @param fqName the class fully qualified name
- * @return calculated target namespace
- */
- public static String composeJaxWsTargetNamespaceByFQName(String fqName)
- {
- ContractChecker.nullCheckParam(fqName, "fqName"); //$NON-NLS-1$
- return composeJaxWsTargetNamespaceByPackage(extractPackage(fqName));
- }
-
- /**
- * Returns the PortType name from the <code>endpointType</code> and <code>seiName</code>.
- * @param endpoint class.
- * @param seiName
- * @return PortType name for the @WebService annotation, the name of the <code>endpointType</code> with the "Port" suffix.
- * @throws NullPointerException when <code>endpointType</code> specified is null.
- */
- public static String getPorttypeName(IType endpointType, String seiName)
- {
- if(endpointType == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- if(seiName != null && seiName.length() > 0)
- {
- return seiName;
- }
-
- return removeBeanSuffixIfRequired(endpointType.getElementName());
- }
-
- /**
- * Removes the "Bean" suffix from the <code>endpointType</code> in case it is present and generates Service name for the specified IType.
- * @param endpoint class.
- * @return Service name for the @WebService annotation, the name of the <code>endpointType</code> without the "Bean" suffix and <code>"Service"</code> at the end.
- * In case the name of the <code>endpointType</code> equals "Bean" then the original name is returned with <code>"Service"</code> ate the end.
- * @throws NullPointerException when <code>endpointType</code> specified is null
- */
- public static String getServiceName(final IType endpointType)
- {
- if(endpointType == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- return removeBeanSuffixIfRequired(endpointType.getElementName()) + SERVICE_SUFFIX;
- }
-
- /**
- * Removes the "Bean" suffix from the endpoint name in case it is present.
- * @param endpointName the name of the endpoint
- * @return the name of the endpoint without the "Bean" suffix. In case the name of the endpoint equals "Bean" then the original name is returned
- */
- private static String removeBeanSuffixIfRequired(final String endpointName)
- {
- assert endpointName != null && endpointName.length() > 0;
-
- if(endpointName.equals(BEAN_SUFFIX))
- {
- return endpointName;
- }
-
- if(endpointName.endsWith(BEAN_SUFFIX))
- {
- return endpointName.substring(0, endpointName.lastIndexOf(BEAN_SUFFIX));
- }
-
- return endpointName;
- }
-
- /**
- * Returns the Port name from the <code>endpointType</code>.
- * @param endpoint class.
- * @return Port name for the @WebService annotation, the name of the <code>endpointType</code> with the "Port" suffix.
- * @throws NullPointerException when <code>endpointType</code> specified is null.
- */
- public static String getPortName(final IType endpointType)
- {
- return getDefaultPortName(endpointType.getElementName());
- }
-
- /**
- * Returns the default service name calculated as the specification states.
- * @param fqName
- * @return the default service name
- * @throws NullPointerException in case <code>endpointType</code> is <code>null</code>
- */
- public static String getDefaultServiceName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName) + SERVICE_SUFFIX;
- }
-
- /**
- * Returns the default wsdl:portType name defined as JAX-WS specification states.
- * @param fqName
- * @return
- */
- public static String getDefaultPorttypeName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("fqName could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName);
- }
-
- /**
- * Return the default name for a wsdl:port defined as JAX-WS specification states
- * @param fqName
- * @return the calculated name
- */
- public static String getDefaultPortName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("fqName could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName) + PORT_SUFFIX;
- }
-
- private static String extractShortName(String fqName)
- {
- int pos = fqName.lastIndexOf('.');
- if (pos ==-1 ) {
- return fqName;
- }
-
- return fqName.substring(pos+1);
- }
-
- private static String extractPackage(final String fqName)
- {
- int pos = fqName.lastIndexOf('.');
- if (pos ==-1 ) {
- return fqName;
- }
-
- return fqName.substring(0, pos);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java
deleted file mode 100755
index 53779a6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-
-/**
- * Convenience methods to manage status objects.
- *
- * @author Joerg Dehmel
- */
-public final class StatusUtils
-{
- private StatusUtils()
- {
- // no instantiation
- }
-
- /**
- * Finds the most severe status from a array of stati.
- * An error is more severe than a warning, and a warning is more severe
- * than ok.
- */
- public static IStatus getMostSevere(IStatus[] status) {
- IStatus max= null;
- for (int i= 0; i < status.length; i++) {
- IStatus curr= status[i];
- if (curr.matches(IStatus.ERROR)) {
- return curr;
- }
- if (max == null || curr.getSeverity() > max.getSeverity()) {
- max= curr;
- }
- }
- return max;
- }
-
- /**
- * Provides a new status object with severity IStatus.CANCEL.
- *
- * @param message
- * status message
- * @return the cancel status
- */
- public static IStatus statusCancel(final String message)
- {
- return createStatus(IStatus.CANCEL, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.ERROR.
- *
- * @param message
- * status message
- * @return the error status
- */
- public static IStatus statusError(final String message)
- {
- return createStatus(IStatus.ERROR, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.ERROR.
- *
- * @param message
- * status message
- * @param ex
- * exception that corresponds to the status
- * @return the error status
- */
- public static IStatus statusError(final String message, final Throwable ex)
- {
- return createStatus(IStatus.ERROR, message, ex);
- }
-
- /**
- * Provides a new status object with severity IStatus.WARNING.
- *
- * @param message
- * status message
- * @return the warning status
- */
- public static IStatus statusWarning(final String message)
- {
- return createStatus(IStatus.WARNING, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.WARNING.
- *
- * @param message
- * status message
- * @param ex
- * exception that corresponds to the status
- * @return the warning status
- */
- public static IStatus statusWarning(final String message, final Throwable ex)
- {
- return createStatus(IStatus.WARNING, message, ex);
- }
-
- /**
- * Provides a new status object with severity IStatus.INFO.
- *
- * @param message
- * status message
- * @return the info status
- */
- public static IStatus statusInfo(final String message)
- {
- return createStatus(IStatus.INFO, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.INFO.
- *
- * @param message
- * status message
- * @return the info status
- */
- public static IStatus statusInfo(final String message, final Throwable cause)
- {
- return createStatus(IStatus.INFO, message, cause);
- }
-
- /**
- * Provides a new status object with severity IStatus.OK.
- *
- * @param message
- * status message
- * @return the ok status
- */
- public static IStatus statusOk(final String message)
- {
- return createStatus(IStatus.OK, message);
- }
-
- private static IStatus createStatus(final int severity, final String message)
- {
- return new Status(severity, "id", 0, message, null); //$NON-NLS-1$
- }
-
- private static IStatus createStatus(final int severity, final String message, final Throwable ex)
- {
- return new Status(severity, "id", 0, message, ex); //$NON-NLS-1$
- }
-
- /**
- * Provides a new multistatus object
- *
- * @param message
- * status message
- * @return multistatus
- */
- public static MultiStatus createMultiStatus(String message)
- {
- return new MultiStatus("id", 0, message, null); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java
deleted file mode 100755
index af2fd38..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.io.FileNotFoundException;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationInspectorImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ArrayValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.BooleanValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ClassValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.IntegerValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ParamValuePairImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.QualifiedNameValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.text.edits.MalformedTreeException;
-
-
-/**
- * Factory class containing common factory and utility methods Annotation processing.
- *
- * @author Plamen Pavlov
- */
-public class AnnotationFactory
-{
- /**
- * Creates complex Annotation, e.g. Annotation of kind \@WebService(param1="value1", param2="value2").
- *
- * @param annotationQName
- * @param paramValuePairs
- *
- * @return Instantiated Annotation of type IComplexAnnotation.
- *
- * @throws NullPointerException in case <tt>annotationQName</tt> or <tt>paramValuePairs</tt> are null.
- * @throws IllegalArgumentException in case <tt>annotationQName</tt> is empty String.
- */
- public static <T extends IJavaElement> IAnnotation<T> createAnnotation(String annotationQName, Set<IParamValuePair> paramValuePairs, final T appliedElement)
- {
- if (annotationQName == null)
- {
- throw new NullPointerException("annotationQName should not be null!"); //$NON-NLS-1$
- }
- if (annotationQName.trim().length() == 0)
- {
- throw new IllegalArgumentException("annotationQName should not be empty String!"); //$NON-NLS-1$
- }
-
- if (paramValuePairs == null)
- {
- throw new NullPointerException("paramValuePairs should not be null!"); //$NON-NLS-1$
- }
-
- final AnnotationImpl<T> impl = new AnnotationImpl<T>(annotationQName, paramValuePairs);
- impl.setJavaElement(appliedElement);
-
- return impl;
- }
-
-
- /**
- * Creates {@link IAnnotation} instance that references <code>appliedElement</code> java element
- * @param annotationQName the annotation name
- * @param appliedElement the java element that this annotation is applied on
- * @param paramValuePairs the annotation attributes
- * @return {@link IAnnotation} instance
- * @throws NullPointerException in case some of params is <code>null</code>
- * @throws IllegalArgumentException in case <code>annotationQName</code> is empty string
- */
- public static IAnnotation<? extends IJavaElement> createAnnotation(String annotationQName, IJavaElement appliedElement, Set<IParamValuePair> paramValuePairs)
- {
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
- if (annotationQName.trim().length() == 0) {
- throw new IllegalArgumentException("annotationQName should not be empty String!"); //$NON-NLS-1$
- }
-
- nullCheckParam(paramValuePairs, "paramValuePairs"); //$NON-NLS-1$
- nullCheckParam(appliedElement, "appliedElement"); //$NON-NLS-1$
-
- final AnnotationImpl<IJavaElement> annotation = new AnnotationImpl<IJavaElement>(annotationQName, paramValuePairs);
- annotation.setAppliedElementWithoutSave(appliedElement);
-
- return annotation;
- }
-
- /**
- * Creates param-value pair needed in complex Annotations.
- *
- * @param param
- * @param value
- *
- * @return instance of IParamValuePair
- *
- * @throws NullPointerException in case <code>param</code> or <code>value</code> is <code>null</code>.
- * @throws IllegalArgumentException in case <code>param</code> parameter is empty String.
- */
- public static IParamValuePair createParamValuePairValue(String param, IValue value)
- {
- if (param == null)
- {
- throw new NullPointerException("param should not be null!"); //$NON-NLS-1$
- }
- if (param.trim().length() == 0)
- {
- throw new IllegalArgumentException("param should not be empty String!"); //$NON-NLS-1$
- }
-
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
-
- return new ParamValuePairImpl(param, value);
- }
-
- /**
- * Creates {@link IValue} instance using provided <code>values</code>.
- *
- * @param values
- *
- * @return instance of {@link IValue}
- *
- * @throws NullPointerException in case <code>values</code> is null.
- * @throws IllegalArgumentException in case <code>values</code> is empty Set.
- */
- public static IValue createArrayValue(Set<IValue> values)
- {
- if (values == null)
- {
- throw new NullPointerException("values should not be null!"); //$NON-NLS-1$
- }
- if (values.size() < 1)
- {
- throw new IllegalArgumentException("values should not be empty Set!"); //$NON-NLS-1$
- }
-
- return new ArrayValueImpl(values);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- */
- public static IValue createBooleanValue(boolean value)
- {
- return new BooleanValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link String}
- */
- public static IValue createClassValue(String value)
- {
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
- if(value.equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("value should not be empty String"); //$NON-NLS-1$
- }
-
- return new ClassValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- */
- public static IValue createIntegerValue(String value)
- {
- return new IntegerValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance using provided <code>qualifiedName</code> fully qualified name.
- *
- * @param qualifiedName
- *
- * @return instance of {@link IValue}
- *
- * @throws NullPointerException in case <tt>qualifiedName</tt> is null.
- * @throws IllegalArgumentException in case <code>qualifiedName</code> is not in correct form e.g. could not be empty String, shold be qualified.
- */
- public static IValue createQualifiedNameValue(String qualifiedName)
- {
- if (qualifiedName == null)
- {
- throw new NullPointerException("qualifiedName should not be null!"); //$NON-NLS-1$
- }
-
- if (qualifiedName.trim().length() == 0 || qualifiedName.indexOf('.') == -1)
- {
- throw new IllegalArgumentException("qualifiedName is not in correct form!"); //$NON-NLS-1$
- }
-
- return new QualifiedNameValueImpl(qualifiedName);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code> content.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- * @throws NullPointerException in case <tt>value</tt> is null.
- */
- public static IValue createStringValue(String value)
- {
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
-
- return new StringValueImpl(value);
- }
-
-
-// /**
-// * Retrieves all Annotations from class.
-// *
-// * @param javaElement
-// *
-// * @return contained annotations in <code>javaElement</code>
-// *
-// * @throws JavaModelException if exception occurs
-// * @throws NullPointerException if <tt>javaElement</tt> is null.
-// * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
-// */
-// public static Set<IAnnotation> getAnnotationsFromJavaElement(IJavaElement javaElement) throws JavaModelException
-// {
-// if (javaElement == null)
-// {
-// throw new NullPointerException("javaElement should not be null!");
-// }
-// if(!(javaElement instanceof IType) || !(javaElement instanceof IMethod) || !(javaElement instanceof IField) || !(javaElement instanceof ITypeParameter))
-// {
-// throw new IllegalArgumentException("javaElement is not of correct type!");
-// }
-// pppppp
-// }
-
- /**
- * Removes all Annotations from <code>javaElement</code>.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
- * @throws AnnotationGeneratorException
- */
- public static void removeAnnotationsFromJavaElement(IJavaElement javaElement) throws AnnotationGeneratorException
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof org.eclipse.jdt.core.IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
- removeAnnotations(javaElement, null);
- }
-
- /**
- * Removes Annotations with names contained in <code>annotations</code> from <code>javaElement</code> and its children, if such exist.
- *
- * @param javaElement
- * @param annotations
- *
- * @throws NullPointerException if <tt>javaElement</tt> or <tt>annotations</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
- * @throws AnnotationGeneratorException
- */
- public static void removeAnnotations(IJavaElement javaElement, Set<String> annotations) throws AnnotationGeneratorException
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof org.eclipse.jdt.core.IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
-
- try
- {
- AnnotationUtils.getInstance().removeAnnotations(javaElement, annotations, true);
- }
- catch (JavaModelException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (MalformedTreeException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (FileNotFoundException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- catch (CoreException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (BadLocationException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- }
-
- /**
- * Create instance of IAnnotationInspector for a specific IType.
- *
- * @param type - IType, which will be inspected.
- *
- * @return IAnnotationInspector
- */
- public static IAnnotationInspector createAnnotationInspector(IType type)
- {
- return new AnnotationInspectorImpl(type);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java
deleted file mode 100755
index 8558a94..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import org.eclipse.jst.ws.jaxws.utils.exception.LocalizedException;
-
-/**
- * Exception thrown by annotation generator in case when unexpected condition is met
- *
- * @author Plamen Pavlov
- */
-
-public class AnnotationGeneratorException extends LocalizedException
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor getting error message, localized message and {@link Throwable} to be wrapped
- *
- * @param message
- * @param localizedMessage
- * @param t
- */
- public AnnotationGeneratorException(final String message, final String localizedMessage, final Throwable t)
- {
- super(message, localizedMessage, t);
- }
-
- /**
- * Constructor with error message and a localized message.
- *
- * @param message
- * @param localizedMessage
- */
- public AnnotationGeneratorException(final String message, final String localizedMessage)
- {
- super(message, localizedMessage);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java
deleted file mode 100755
index 3f0732b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java
+++ /dev/null
@@ -1,600 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.io.FileNotFoundException;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.resources.EditResourcesManager;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.IFileUtils;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Class, which is used to save the annotations.
- *
- * @author Plamen Pavlov
- *
- */
-public class AnnotationWriter
-{
- private static AnnotationWriter writer = null;
- private final IFileUtils fileUtils = FileUtils.getInstance();
-
- /**
- * The factory method.
- *
- * @return a AnnotationWriter instance.
- */
- public static<T extends IJavaElement> AnnotationWriter getInstance()
- {
- if (writer == null)
- {
- writer = new AnnotationWriter();
- }
- return writer;
- }
-
- /**
- * Adds Annotation to specific IJavaElement.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- * @throws AnnotationGeneratorException.
- */
- public <T extends IJavaElement> void setAppliedElement(final IAnnotation<T> annotation, final T javaElement) throws AnnotationGeneratorException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- annotationImpl.setJavaElement(javaElement);
-
- setAnnotatationStringVallue(annotationImpl, true, javaElement);
- }
-
- private <T extends IJavaElement> void setAnnotatationStringVallue(AnnotationImpl<T> annotationImpl, boolean needSave, final T javaElement) throws AnnotationGeneratorException
- {
- if (!needSave) {
- return;
- }
-
- if(javaElement instanceof IType)
- {
- addToClass(annotationImpl, (IType)javaElement);
- }
- if(javaElement instanceof IField)
- {
- addToField(annotationImpl, (IField)javaElement);
- }
- if(javaElement instanceof IMethod)
- {
- addToMethod(annotationImpl, (IMethod)javaElement);
- }
- if(javaElement instanceof ITypeParameter)
- {
- addToParam(annotationImpl, (ITypeParameter)javaElement);
- }
- }
-
- private <T extends IJavaElement> void addToClass(AnnotationImpl<T> annotationImpl, IType classType) throws AnnotationGeneratorException
- {
- String className = classType.getElementName();
-
- addToMember(annotationImpl, classType.getCompilationUnit(), classType, className);
- }
-
- private <T extends IJavaElement> void addToField(AnnotationImpl<T> annotationImpl, IField fieldType) throws AnnotationGeneratorException
- {
- String className = fieldType.getParent().getElementName();
-
- addToMember(annotationImpl, fieldType.getCompilationUnit(), fieldType, className);
- }
-
- private <T extends IJavaElement> void addToMethod(AnnotationImpl<T> annotationImpl, IMethod methodType) throws AnnotationGeneratorException
- {
- String className = methodType.getParent().getElementName();
-
- addToMember(annotationImpl, methodType.getCompilationUnit(), methodType, className);
- }
-
- private <T extends IJavaElement> void addToParam(AnnotationImpl<T> annotationImpl, ITypeParameter typeParam) throws AnnotationGeneratorException
- {
- IMember member = typeParam.getDeclaringMember();
- String className = null;
- if (member.getElementType() == IJavaElement.METHOD)
- {
- className = member.getDeclaringType().getElementName();
- } else
- {
- className = member.getElementName();
- }
-
- addToMember(annotationImpl, member.getCompilationUnit(), typeParam, className);
- }
-
- private <T extends IJavaElement> void addToMember(AnnotationImpl<T> annotationImpl, ICompilationUnit cUnit, IJavaElement type, String className) throws AnnotationGeneratorException
- {
- try
- {
- if (cUnit == null)
- {
- return;
- }
-
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
- AST ast = unit.getAST();
-
- TypeDeclaration typeDeclaration = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration != null)
- {
- switch (type.getElementType())
- {
- case IJavaElement.TYPE:
- addAnnotation(annotationImpl, cUnit, unit, ast, typeDeclaration);
- break;
- case IJavaElement.METHOD:
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) type, typeDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, methodDeclaration);
- break;
- case IJavaElement.FIELD:
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration((IField) type, typeDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, fieldDeclaration);
- break;
- case IJavaElement.TYPE_PARAMETER:
- ITypeParameter typeParameter = (ITypeParameter) type;
- if (typeParameter.getDeclaringMember().getElementType() == IJavaElement.METHOD)
- {
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) typeParameter.getDeclaringMember(), typeDeclaration);
- SingleVariableDeclaration paramDeclaration = getParamDeclaration(typeParameter, methodDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, paramDeclaration);
- }
- break;
- default:
- throw new IllegalArgumentException("unsupported type for annotation"); //$NON-NLS-1$
- }
- }
- }
- catch (MalformedTreeException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (CoreException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (BadLocationException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> void addAnnotation(AnnotationImpl<T> annotationImpl, ICompilationUnit cUnit, CompilationUnit unit, AST ast, ASTNode declaration)
- throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- editResManager().setFileEditable((IFile) cUnit.getResource());
-
- unit.recordModifications();
- Expression annot = annotationImpl.getExpression(unit, ast);
-
- List modifiers = null;
-
- switch (declaration.getNodeType())
- {
- case ASTNode.METHOD_DECLARATION:
- case ASTNode.FIELD_DECLARATION:
- case ASTNode.TYPE_DECLARATION:
- modifiers = ((BodyDeclaration) declaration).modifiers();
- break;
- case ASTNode.SINGLE_VARIABLE_DECLARATION:
- modifiers = ((SingleVariableDeclaration) declaration).modifiers();
- break;
- default:
- throw new IllegalArgumentException("addAnnotation() illegal declataion type"); //$NON-NLS-1$
- }
-
- modifiers.add(0, annot);
-
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
-
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- IStatus status = editResManager().setFileEditable((IFile) cUnit.getResource());
- if(status.getSeverity() == IStatus.OK)
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(cUnit, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- private static SingleVariableDeclaration getParamDeclaration(ITypeParameter typeParameter, MethodDeclaration methodDeclaration)
- {
- //TODO check this method
- final String paramName = typeParameter.getElementName();
-
- for (Object decl : methodDeclaration.parameters())
- {
- if (!(decl instanceof SingleVariableDeclaration))
- {
- continue;
- }
-
- if (paramName.equals(((SingleVariableDeclaration) decl).getName().toString()))
- {
- return (SingleVariableDeclaration) decl;
- }
- }
-
- return null;
- }
-
- /**
- * Updates the Parameter-Value Pairs of specific Annotation.
- *
- * @param annotation - Annotation, which will be updated.
- * @throws AnnotationGeneratorException
- * @throws CoreException
- */
- public <T extends IJavaElement> void update(final IAnnotation<T> annotation) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotattionImpl = new AnnotationImpl<T>(annotation.getAnnotationName(), annotation.getParamValuePairs());
- try
- {
- updateTheAnnotation(annotation.getAppliedElement(), annotattionImpl);
- }
- catch(MalformedTreeException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (BadLocationException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
- /**
- * Updates the Param-Value Pairs of specific Annotation.
- *
- * @param annotation - Annotation, which will be updated.
- * @param paramValuePairs which will be updated. Old pairs will be replaced with the new once.
- * @param replacePreviousPairs boolean value which specifies the way, how new IParamValuePairs will be updated. If the value is <tt>true</tt>,
- * the Set with the old IParamValuePairs will be cleared and the new values will be applied. If the value is <tt>false</tt> the old pairs will be kept
- * and will be updated with the values from the new Set, if there are params which do not exist in the old one, they will be added.
- *
- * @throws CoreException
- * @throws AnnotationGeneratorException
- *
- * @deprecated - use public <T extends IJavaElement> void update(final IAnnotation<T> annotation) instead.
- */
- @Deprecated
- public <T extends IJavaElement> void update(final IAnnotation<T> annotation, Set<IParamValuePair> paramValuePairs, boolean replacePreviousPairs) throws AnnotationGeneratorException, CoreException
- {
- updateAnnotation(annotation, annotation.getAppliedElement(), paramValuePairs, replacePreviousPairs);
- }
-
- /**
- *
- * @param <T>
- * @param annotation
- * @param javaElement
- * @param paramValuePairs
- * @param replacePreviousPairs
- * @throws AnnotationGeneratorException
- * @throws CoreException
- *
- */
- private <T extends IJavaElement> void updateAnnotation(final IAnnotation<T> annotation, final T javaElement, Set<IParamValuePair> paramValuePairs, boolean replacePreviousPairs) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- try
- {
- if(replacePreviousPairs)
- {
- annotationImpl.setParamValuePairs(paramValuePairs);
- }
- else
- {
- for (IParamValuePair pair : paramValuePairs)
- {
- boolean isUpdated = false;
- Set<IParamValuePair> tmpParamValuePairs = annotationImpl.getParamValuePairs();
- for (IParamValuePair thisPair : tmpParamValuePairs)
- {
- if(thisPair.getParam().equals(pair.getParam()))
- {
- tmpParamValuePairs.remove(thisPair);
- tmpParamValuePairs.add(pair);
- isUpdated = true;
- break;
- }
- }
- if(!isUpdated)
- {
- tmpParamValuePairs.add(pair);
- }
- annotationImpl.setParamValuePairs(tmpParamValuePairs);
- }
- }
- updateTheAnnotation(javaElement, annotationImpl);
-
- //remove(annotation);
- //setAppliedElement(annotation, javaElement);
- }
- catch(MalformedTreeException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (BadLocationException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
-
- /**
- * Removes Annotation.
- *
- * @param annotation - Annotation, which will be removed.
- *
- * @throws BadLocationException
- * @throws CoreException
- * @throws AnnotationGeneratorException
- * @throws FileNotFoundException
- */
- public <T extends IJavaElement> void remove(final IAnnotation<T> annotation) throws AnnotationGeneratorException, CoreException
- {
- removeAnnotation(annotation, annotation.getAppliedElement());
- }
-
- private <T extends IJavaElement> void removeAnnotation(final IAnnotation<T> annotation, final T javaElement) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- try
- {
-// if(annotationImpl.getAnnotationStringValue() == null || annotationImpl.getAnnotationStringValue().trim().equals(""))
-// {
-// annotationImpl.setAnnotationStringValue(createAnnotatationStringVallue(annotationImpl, javaElement));
-// AnnotationUtils.getInstance().removeAnnotation(javaElement, annotationImpl.getAnnotationStringValue());
-// }
-// else
-// {
- AnnotationUtils.getInstance().removeAnnotation(javaElement, annotationImpl.getSimpleAnnotationName());
-// }
- } catch (BadLocationException ble)
- {
- throw new AnnotationGeneratorException(ble.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, ble);
- } catch (FileNotFoundException fnfe)
- {
- throw new AnnotationGeneratorException(fnfe.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, fnfe);
- }
- }
-
- // i036509 added
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> void updateTheAnnotation(final T javaElement, final AnnotationImpl<T> annotationImpl) throws BadLocationException, CoreException, AnnotationGeneratorException, FileNotFoundException
- {
- final ICompilationUnit iCu = getCu(javaElement);
- final CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(iCu, null);
-
- BodyDeclaration bd = null;
- Annotation found = null;
- if(javaElement instanceof IType)
- {
- bd = ASTUtils.getInstance().getTypeDeclaration(javaElement.getElementName(), unit);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof IMethod)
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IMethod)javaElement).getDeclaringType().getElementName(), unit);
- bd = ASTUtils.getInstance().getMethodDeclaration(((IMethod)javaElement), td);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof IField)
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IField)javaElement).getDeclaringType().getElementName(), unit);
- bd = ASTUtils.getInstance().getFieldDeclaration(((IField)javaElement), td);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof ITypeParameter)
- {
- if(((ITypeParameter)javaElement).getDeclaringMember() instanceof IType)
- {
- bd = ASTUtils.getInstance().getTypeDeclaration(((ITypeParameter)javaElement).getDeclaringMember().getElementName(), unit);
- SingleVariableDeclaration param = findParameter(bd, javaElement);
- if(param != null)
- {
- found = findParamAnnotation(param, annotationImpl, javaElement);
- }
-
- unit.recordModifications();
- if (found!=null) {
- param.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- param.modifiers().add(0, annot);
- }
- else
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IMethod)((ITypeParameter)javaElement).getParent()).getDeclaringType(). getElementName(), unit);
- bd = ASTUtils.getInstance().getMethodDeclaration(((IMethod)((ITypeParameter)javaElement).getParent()), td);
- SingleVariableDeclaration param = findParameter(bd, javaElement);
- if(param != null)
- {
- found = findParamAnnotation(param, annotationImpl, javaElement);
- }
-
- unit.recordModifications();
- if (found!=null) {
- param.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- param.modifiers().add(0, annot);
- }
- }
-
- setAnnotatationStringVallue(annotationImpl, false, javaElement);
- final IDocument doc = AnnotationUtils.getInstance().getDocument(iCu);
- final TextEdit edit = unit.rewrite(doc, javaElement.getJavaProject().getOptions(true));
- edit.apply(doc);
-
- IStatus status = editResManager().setFileEditable((IFile) iCu.getResource());
- if(status.getSeverity() == IStatus.OK)
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(iCu, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- @SuppressWarnings("unchecked")
- private Annotation findAnnotation(final BodyDeclaration td, final IAnnotation<? extends IJavaElement> annotation)
- {
- Annotation ann;
- for (IExtendedModifier modifier : (List<IExtendedModifier>)td.modifiers())
- {
- if(!modifier.isAnnotation()) {
- continue;
- }
-
- ann = (Annotation)modifier;
- if (annotation.getAnnotationName().endsWith(ann.getTypeName().getFullyQualifiedName())) {
- return ann;
- }
- }
-
- return null;
- }
-
- private <T extends IJavaElement> SingleVariableDeclaration findParameter(final BodyDeclaration td, T javaElement)
- {
- if (td != null)
- {
- for (Object param : ((MethodDeclaration)td).parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)javaElement).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- return (SingleVariableDeclaration)param;
- }
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Annotation findParamAnnotation(final SingleVariableDeclaration param, final IAnnotation<? extends IJavaElement> annotation, T javaElement)
- {
- Annotation ann;
- for (IExtendedModifier modifier : (List<IExtendedModifier>)(param.modifiers()))
- {
- if(!modifier.isAnnotation()) {
- continue;
- }
-
- ann = (Annotation)modifier;
- if (annotation.getAnnotationName().endsWith(ann.getTypeName().getFullyQualifiedName())) {
- return ann;
- }
- }
- return null;
- }
-
- private ICompilationUnit getCu(final IJavaElement javaElement)
- {
- switch (javaElement.getElementType())
- {
- case IJavaElement.TYPE:
- return ((IType) javaElement).getCompilationUnit();
- case IJavaElement.FIELD:
- return ((IField) javaElement).getCompilationUnit();
- case IJavaElement.METHOD:
- return ((IMethod) javaElement).getCompilationUnit();
- case IJavaElement.TYPE_PARAMETER:
- return ((ITypeParameter) javaElement).getDeclaringMember().getCompilationUnit();
- }
-
- return null;
- }
-
- private EditResourcesManager editResManager()
- {
- return new EditResourcesManager();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java
deleted file mode 100755
index 0d8d839..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-/**
- * Interface representing Complex Annotation consisting of param-value pairs.
- *
- * @author Plamen Pavlov
- */
-public interface IAnnotation<T extends IJavaElement>
-{
- /**
- * Return the param-value pairs which this Annotation has.
- *
- * @return Set of param-values pairs.
- */
- public Set<IParamValuePair> getParamValuePairs();
-
- /**
- * Returns the value of the parameter with name param.
- * @param param - the name of the parameter who's value is requested
- * @return - the value represented as a string. Null if such parameter cannot be found or has a value of null.
- * @throws - NullPointerException if param is null
- */
- public String getPropertyValue(String param);
-
- /**
- * Returns the T, to which this annotattion is associated.
- */
- public T getAppliedElement();
-
-
-//From IAnnotattionBase
- /**
- * @return - annotation name
- */
- public String getAnnotationName();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java
deleted file mode 100755
index 2f900d6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.text.edits.MalformedTreeException;
-
-/**
- * Base interface representing Annotation and the functionality, required by it.
- *
- * @author Plamen Pavlov
- */
-public interface IAnnotationBase<T extends IJavaElement>
-{
- /** simple annotation type ID */
- public final int SIMPLE_ANNOTATION = 1;
-
- /** single element annotation type ID */
- public final int SINGLE_ELEMENT_ANNOTATION = 2;
-
- /** complex annotation type ID */
- public final int COMPLEX_ANNOTATION = 4;
-
- /**
- * @return - annotation name
- */
- public String getAnnotationName();
-
- /**
- * Getting the TypeID of current Annotation
- *
- * @return Integer value, which represents the Annotation TypeID
- */
- public int getType();
-
- /**
- * Adds current Annotation to specific IJavaElement. It is not possible to have IMember as parameter because there is ITypeParameter as parameter when add to TypParameter is executed.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- * @throws AnnotationGeneratorException.
- */
- public void setAppliedElement(T javaElement) throws AnnotationGeneratorException;
-
- /**
- * Remove the current Annotation from the associated JavaElement.
- *
- * @throws BadLocationException
- * @throws CoreException
- * @throws AnnotationGeneratorException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void remove() throws MalformedTreeException, FileNotFoundException, AnnotationGeneratorException, CoreException, BadLocationException;
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java
deleted file mode 100755
index c3f05f5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.util.Collection;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-
-public interface IAnnotationInspector
-{
- /**
- * Retrieves all Type level Annotations from <code>type</code>, which is used to instantiate the IAnnotationInspector.
- *
- * @return contained Type level Annotations in <code>type</code> or empty Collection if not present.
- *
- * @throws JavaModelException
- */
- Collection<IAnnotation<IType>> inspectType() throws JavaModelException;
-
- /**
- * Retrieves a Type level Annotation with specific QName from <code>type</code>, which is used to instantiate the IAnnotationInspector.
- *
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return Type level Annotation in <code>type</code> or <code>null</code>, if such Annotation do not present.
- *
- * @throws NullPointerException if <code>annotationQName</code> is <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IType> inspectType(final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all Method level Annotations from <code>method</code>.
- *
- * @param method
- *
- * @return contained Method level Annotations in <code>method</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <tt>method</tt> is null.
- * @throws JavaModelException
- */
- Collection<IAnnotation<IMethod>> inspectMethod(IMethod method) throws JavaModelException;
-
- /**
- * Retrieves a Method level Annotation with specific QName from <code>method</code>.
- *
- * @param method
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained Method level Annotation in <code>method</code> or <code>null</code>.
- *
- * @throws NullPointerException if <tt>method</tt> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IMethod> inspectMethod(IMethod method, final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all Field level Annotations from <code>field</code>.
- *
- * @param field
- *
- * @return contained Filed level Annotations in <code>field</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <code>field</code> is <code>null</code>.
- * @throws JavaModelException
- */
- Collection<IAnnotation<IField>> inspectField(IField field) throws JavaModelException;
-
- /**
- * Retrieves a Field level Annotation with specific QName from <code>field</code>.
- *
- * @param field
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained Filed level Annotations in <code>field</code> or <code>null</code>.
- *
- * @throws NullPointerException if <code>field</code> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IField> inspectField(IField field, final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all TypeParameter level Annotations from <code>param</code>.
- *
- * @param param
- *
- * @return contained TypeParameter level Annotations in <code>param</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <code>param</code> is <code>null</code>.
- * @throws JavaModelException
- */
- Collection<IAnnotation<ITypeParameter>> inspectParam(ITypeParameter param) throws JavaModelException;
-
- /**
- * Retrieves a TypeParameter level Annotation with specific QName from <code>param</code>.
- *
- * @param param
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained TypeParameter level Annotations in <code>param</code> or <code>null</code>.
- *
- * @throws NullPointerException if <code>param</code> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<ITypeParameter> inspectParam(ITypeParameter param, final String annotationQName) throws JavaModelException;
-
-
-
-
-// /**
-// * Retrieves all annotations from <code>javaElement</code>.
-// *
-// * @param javaElement
-// *
-// * @return contained annotations in <code>javaElement</code> or empty Colleaction if not present.
-// *
-// * @throws NullPointerException if <tt>javaElement</tt> is null.
-// * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField.
-// * @throws JavaModelException
-// */
-// public Collection<IAnnotation> inspect(IJavaElement javaElement) throws JavaModelException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java
deleted file mode 100755
index db90bcb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AttributeTypeEnum;
-
-public interface IAnnotationProperty
-{
- public String getAnnotationName();
-
- public String getAttributeName();
-
- public String getValue();
-
- public AttributeTypeEnum getAttributeType();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java
deleted file mode 100755
index 3cc7694..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.lang.annotation.ElementType;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationProperty;
-
-/**
- * Interface for annotations container.
- *
- * @author Plamen Pavlov
- *
- */
-public interface IAnnotationPropertyContainer
-{
- public void addAnnotationProperty(final AnnotationProperty annotationProperty, final ElementType target);
-
- public Set<IAnnotation<ITypeParameter>> getParameterAnnotations(ITypeParameter tParam);
-
- public Set<IAnnotation<IType>> getTypeAnnotations(IType type);
-
- public Set<IAnnotation<IMethod>> getMethodAnnotations(IMethod method);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java
deleted file mode 100755
index c47636f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Class that holds information to locate specific region in the source code
- *
- */
-public interface ILocator
-{
- /**
- * @return the line number in the source where the region pointed by this locator starts
- */
- public int getLineNumber();
-
-
- /**
- * @return the index of the first character of this region in source code
- */
- public int getStartPosition();
-
- /**
- * @return the length of the region
- */
- public int getLength();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java
deleted file mode 100755
index ffe6e5c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Interface representing param value pair in annotation. Param value pair has the following form: param=value
- *
- * @author Plamen Pavlov
- */
-public interface IParamValuePair
-{
- /**
- * @return param name
- */
- public String getParam();
-
- /**
- * @return the value
- */
- public IValue getValue();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java
deleted file mode 100755
index 32c4a4c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Interface representing artifact value in annotation.
- *
- * @author Plamen Pavlov
- */
-public interface IValue
-{
- /**
- * Obtains the string representation of this value. The obtained string representation can later on be used to instantiate
- * an instance of the type of the value that will be considedered equal to the returned value.
- * <p>
- * <c>@AnnotationExample(1)</c> //annoation with one attribute/parameter called "value" with value of "1".
- * </p>
- * The toString method will return the string "1", which can later on be used by Integer.parse(String) to create an instance of Integer
- * equal to the value represented by the integer literal 1
- * @return the string representation of this value
- */
- public String toString();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java
deleted file mode 100755
index 11997ed..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.clazz;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-
-/**
- * Utility class that provides helper methods for {@link AST} processing.
- *
- * @author Georgi Vachkov
- */
-public class ASTUtils
-{
- private static ASTUtils instance;
-
- private ASTUtils() {
- // disable construction
- }
-
- /**
- * @return create new instance for this utility
- */
- public static ASTUtils getInstance() {
- if(instance==null) {
- instance = new ASTUtils();
- }
- return instance;
- }
-
- /**
- * Creates AST tree out of {@link File} instance.
- * @param sourceFile java class file
- * @param monitor progress monitor
- * @return created {@link ASTNode}
- * @throws IOException
- */
- public ASTNode createAST(final File sourceFile, final IProgressMonitor monitor) throws IOException
- {
- nullCheckParam(sourceFile, "sourceFile"); //$NON-NLS-1$
-
- final ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(FileUtils.getInstance().getFileContent(sourceFile).toCharArray());
- return parser.createAST(monitor);
- }
-
- /**
- * Creates {@link AST} tree out of {@link IType} instance.
- * @param sourceType java class
- * @param monitor progress monitor
- * @return created {@link ASTNode} instance
- */
- public CompilationUnit createCompilationUnit(final ICompilationUnit sourceCu, final IProgressMonitor monitor)
- {
- nullCheckParam(sourceCu, "sourceCu"); //$NON-NLS-1$
- final ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(sourceCu);
- parser.setBindingsRecovery(false);
- return (CompilationUnit)parser.createAST(monitor);
- }
-
- /**
- * Finds {@link FieldDeclaration} in {@link TypeDeclaration} with name <code>fieldType.getElementName()</code>.
- *
- * @param fieldType
- * @param typeDeclaration
- * @return found object or <code>null</code>
- */
- public FieldDeclaration getFieldDeclaration(final IField fieldType, final TypeDeclaration typeDeclaration)
- {
- for (FieldDeclaration fd : typeDeclaration.getFields())
- {
- for (Object fr : fd.fragments())
- {
- VariableDeclarationFragment vdf = (VariableDeclarationFragment) fr;
- if (vdf.getName().getFullyQualifiedName().equals(fieldType.getElementName()))
- {
- return fd;
- }
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private boolean compareMethodParams(final IMethod methodType, final MethodDeclaration md)
- {
- List<SingleVariableDeclaration> list = md.parameters();
- if (list.size() == methodType.getNumberOfParameters())
- {
- String[] parameterTypes = methodType.getParameterTypes();
- for (int i = 0; i < list.size(); i++)
- {
- if (!isSameParam(parameterTypes[i], (SingleVariableDeclaration) list.get(i)))
- {
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- private boolean isSameParam(final String type, final SingleVariableDeclaration svDecl)
- {
- return type.equals(getTypeSignature(svDecl));
- }
-
- /**
- * Retrieves type signature from {@link SingleVariableDeclaration}. As {@link SingleVariableDeclaration} returns only the clean type in case
- * declaration of type <tt>int paraArr[][]</tt> is in code the method adds array identifiers for type declaration int this case.
- *
- * @param svDecl
- * @return the signatyre for the type
- */
- public String getTypeSignature(final SingleVariableDeclaration svDecl)
- {
- String typeName = createDimensionedTypeName(Signature.createTypeSignature(svDecl.getType().toString(), false), svDecl.getExtraDimensions());
-
- // Varargs append another dimension
- if (svDecl.isVarargs())
- {
- typeName = Signature.C_ARRAY + typeName;
- }
-
- return typeName;
- }
-
- private String createDimensionedTypeName(final String typeName, final int dimensions)
- {
- final StringBuilder result = new StringBuilder(typeName);
- final String dimensionString = createDimensionString(dimensions);
- while(!result.toString().startsWith(dimensionString))
- {
- result.insert(0, Signature.C_ARRAY);
- }
-
- return result.toString();
- }
-
- private String createDimensionString(final int dimensions)
- {
- final char[] dimensionChars = new char[dimensions];
- Arrays.fill(dimensionChars, Signature.C_ARRAY);
- return new String(dimensionChars);
- }
-
- /**
- * Finds {@link MethodDeclaration} in {@link TypeDeclaration} having name <code>methodType.getElementName()</code>.
- *
- * @param methodType
- * @param typeDeclaration
- * @return found object or <code>null</code>
- */
- public MethodDeclaration getMethodDeclaration(final IMethod methodType, final TypeDeclaration typeDeclaration)
- {
- for (MethodDeclaration md : typeDeclaration.getMethods())
- {
- if (md.getName().getFullyQualifiedName().equals(methodType.getElementName()))
- {
- if (compareMethodParams(methodType, md))
- {
- return md;
- }
- }
- }
-
- return null;
- }
-
- /**
- * Retrieves {@link TypeDeclaration} from {@link CompilationUnit} with name <tt>className</tt>
- *
- * @param className
- * @param unit
- * @return found {@link TypeDeclaration} or <code>null</code>
- */
- @SuppressWarnings("unchecked")
- public AbstractTypeDeclaration getTypeDeclaration(final String className, final CompilationUnit unit)
- {
- AbstractTypeDeclaration typeDeclaration = null;
- // looking up the selected type
- for (Object typeObject : unit.types())
- {
- AbstractTypeDeclaration tmpTypeDeclaration = (AbstractTypeDeclaration) typeObject;
- if (tmpTypeDeclaration.getName().getFullyQualifiedName().equals(className))
- {
- typeDeclaration = tmpTypeDeclaration;
- break;
- }
- }
-
- if (typeDeclaration == null)
- {
- List<AbstractTypeDeclaration> list = unit.types();
- typeDeclaration = getInnerClass(list.toArray(new AbstractTypeDeclaration[list.size()]), className);
- }
-
- return typeDeclaration;
- }
-
- private AbstractTypeDeclaration getInnerClass(final AbstractTypeDeclaration[] types, final String className)
- {
- AbstractTypeDeclaration result = null;
- for (AbstractTypeDeclaration abstractType : types)
- {
- if (abstractType.getName().getFullyQualifiedName().equals(className)) {
- return abstractType;
- }
-
- if (!(abstractType instanceof TypeDeclaration)) {
- continue;
- }
-
- result = getInnerClass((AbstractTypeDeclaration[]) ((TypeDeclaration) abstractType).getTypes(), className);
- if (result != null) {
- return result;
- }
- }
-
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/dom/validation/DomValidationConstants.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/dom/validation/DomValidationConstants.java
deleted file mode 100755
index 6ea7b68..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/dom/validation/DomValidationConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.dom.validation;
-
-public class DomValidationConstants
-{
- public static final String MARKER_ID = "org.eclipse.jst.ws.jaxws.dom.integration.WsValidatorMarker"; //$NON-NLS-1$
-
- public static final String IMPLEMENTATION = "implementation"; //$NON-NLS-1$
-
- public static final String WS_CONSTRAINT_ID = "webServiceConstraint"; //$NON-NLS-1$
- public static final String WP_CONSTRAINT_ID = "webParamConstraint"; //$NON-NLS-1$
- public static final String WM_CONSTRAINT_ID = "webMethodConstraint"; //$NON-NLS-1$
- public static final String SEI_CONSTRAINT_ID = "seiConstraint"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java
deleted file mode 100755
index 1ce0843..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.exception;
-
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-
-
-/**
- * This is base class for all CHECKED exceptions for the WS Tools
- * toolset. This exception correctly overrides getLocalizedMessage()
- * of Exception class and provide proper localized message.
- * To achieve that there is a limitation - it will be impossible to return localized
- * message if it haven't been passed to the constructor of exception, so there is no
- * constructor without localized message.
- *
- * @author Mladen Tomov
- **/
-
-public class LocalizedException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- private final String localizedMessage;
-
- /**
- * Constructs exception with ability to provide localized message
- * @param message - the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method)
- * @param localizedMessage - the localized message (which is saved for later retrieval
- * by the {@link #getLocalizedMessage()} method)
- *
- * @throws NullPointerException - in case localized message is null
- * */
- public LocalizedException(String message, String localizedMessage) {
- super(message);
- ContractChecker.nullCheckParam(localizedMessage, "localizedMessage"); //$NON-NLS-1$
- this.localizedMessage = localizedMessage;
- }
-
- /**
- * Constructs exception with ability to provide localized message
- * @param message - the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method)
- * @param localizedMessage - the localized message (which is saved for later retrieval
- * by the {@link #getLocalizedMessage()} method)
- * @param cause - cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method).
- *
- * @throws NullPointerException - in case localized message is null
- * */
-
- public LocalizedException(String message, String localizedMessage, Throwable cause) {
- super(message, cause);
- ContractChecker.nullCheckParam(localizedMessage, "localizedMessage"); //$NON-NLS-1$
- this.localizedMessage = localizedMessage;
- }
-
- /**
- * Returns localized message with which the exception was constructed.*/
- @Override
- public String getLocalizedMessage() {
- return localizedMessage;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java
deleted file mode 100755
index da21294..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.exception;
-
-
-/**
- * Indicates that a resource of any kind couldn't be found but this was expected.
- *
- * @author Joerg Dehmel
- */
-public class MissingResourceException extends LocalizedException
-{
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Creates an instance with a message and a localized message.
- *
- * @param message
- * error message
- * @param localizedMessage
- * localized message
- */
- public MissingResourceException(final String message, final String localizedMessage)
- {
- super(message, localizedMessage);
- }
-
- /**
- * Creates an instance with message, localized message and causing exception.
- *
- * @param message
- * error message
- * @param localizedMessage
- * localized message
- * @param cause
- * causing exception
- */
- public MissingResourceException(final String message, final String localizedMessage, final Throwable cause)
- {
- super(message, localizedMessage, cause);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java
deleted file mode 100755
index e88da7f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.facets;
-
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-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;
-
-
-public class FacetUtils implements IFacetUtils
-{
- /**
- * @throws NullPointerException
- * if <c>project</c> or <c>facetIds</c> is null
- */
- public boolean hasAnyFacet(IProject project, String... facetIds) throws CoreException
- {
- ContractChecker.nullCheckParam(project);
- ContractChecker.nullCheckParam(facetIds);
-
- if (!isFacetedProject(project))
- {
- return false;
- }
-
- final IFacetedProject facetedProject = getFacetedProject(project);
- for (String facetId : facetIds)
- {
- final IProjectFacet facet = ProjectFacetsManager.getProjectFacet(facetId);
- if (facetedProject.hasProjectFacet(facet))
- {
- return true;
- }
- }
- return false;
- }
-
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId) throws CoreException
- {
- return hasFacetWithVersion(project, facetVersion, facetId, true);
- }
-
- public boolean isFacetedProject(IProject project) throws CoreException
- {
- Set<IFacetedProject> facetedProjects = getAllWorkspaceFacetedProjects();
- final Iterator<IFacetedProject> i = facetedProjects.iterator();
- while (i.hasNext())
- {
- final IFacetedProject fp = (IFacetedProject) i.next();
- if (project.equals(fp.getProject()))
- {
- return true;
- }
- }
- return false;
- }
-
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId, boolean acceptHigherFacetVersion) throws CoreException
- {
- ContractChecker.nullCheckParam(project);
- ContractChecker.nullCheckParam(facetVersion);
- ContractChecker.nullCheckParam(facetId);
-
- if (!isFacetedProject(project))
- {
- return false;
- }
-
- Set<IProjectFacetVersion> allFacetsVersions = getProjectFacets(project);
- for (IProjectFacetVersion ver : allFacetsVersions)
- {
- if (ver.getProjectFacet().getId().equals(facetId))
- {
- return isFacetAcceptable(ver, facetVersion, acceptHigherFacetVersion);
- }
- }
-
- return false;
- }
-
- private boolean isFacetAcceptable(IProjectFacetVersion facetVersion, String facetVersionId, boolean acceptHigherFacetVersion)
- throws CoreException
- {
- assert facetVersion != null;
-
- // Check for exact version
- if (!acceptHigherFacetVersion)
- {
- return facetVersion.getVersionString().equals(facetVersionId);
- }
-
- Comparator<String> comparator = facetVersion.getProjectFacet().getVersionComparator();
- String currentFacetVersion = facetVersion.getVersionString();
- return comparator.compare(currentFacetVersion, facetVersionId) >= 0;
- }
-
- private IFacetedProject getFacetedProject(IProject project) throws CoreException
- {
- return ProjectFacetsManager.create(project);
- }
-
- private Set<IProjectFacetVersion> getProjectFacets(IProject project) throws CoreException
- {
- assert isFacetedProject(project);
-
- return getFacetedProject(project).getProjectFacets();
- }
-
- private Set<IFacetedProject> getAllWorkspaceFacetedProjects() throws CoreException
- {
- return ProjectFacetsManager.getFacetedProjects();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java
deleted file mode 100755
index 8727750..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.facets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-
-public interface IFacetUtils
-{
- /**
- * Constant for EJB30 facet ID
- */
- public static final String EJB_30_FACET_ID = "jst.ejb"; //$NON-NLS-1$
-
- /**
- * Constant for EJB30 facet version 3.0
- */
- public static final String EJB_30_FACET_VERSION = "3.0"; //$NON-NLS-1$
-
- /**
- * Constant for Web 2.5 facet ID
- */
- public static final String WEB_25_FACET_ID = "jst.web"; //$NON-NLS-1$
-
- /**
- * Constant for Web facet version 2.5
- */
- public static final String WEB_25_FACET_VERSION = "2.5"; //$NON-NLS-1$
-
- /**
- * Constant for Application client facet ID
- */
- public static final String APPCLIENT_25_FACET_ID = "jst.appclient"; //$NON-NLS-1$
-
- /**
- * Constant for Application client facet version 2.5
- */
- public static final String APPCLIENT_25_FACET_VERSION = "5.0"; //$NON-NLS-1$
-
- /**
- * Checks whether <code>project</code> has a facet with id <code>facetId</code> with version <code>facetVersion</code>
- * In case the project specified is not a faceted project, false is returned
- * This is a convenience method that is equivalent to invoking hasFacetWithVersion(project, facetVersion, facetId, false)
- * @param project the project
- * @param facetVersion the facet version
- * @param facetId the facet id
- * @return true in case the project specified is a faceted project and has the facet with the version specified; false otherwise
- * @throws CoreException
- * @throws NullPointerException when any of the input parameters is null
- * @see IFacetUtils#hasFacetWithVersion(IProject, String, String, boolean)
- */
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId) throws CoreException;
-
- /**
- * Checks whether <code>project</code> has a facet with id <code>facetId</code> with version <code>facetVersion</code>
- * In case the project specified is not a faceted project, false is returned
- * @param project the project
- * @param facetVersion the facet version
- * @param facetId the facet id
- * @param acceptHigherFacetVersion a flag indicating whether higher facet versions are acceptable
- * @return true in case the project specified is a faceted project and has the facet with the version specified; false otherwise
- * @throws CoreException
- * @throws NullPointerException when any of the input parameters is null
- */
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId, boolean acceptHigherFacetVersion) throws CoreException;
-
- /**
- * Checks whether the project specified is a faceted project
- * @param project the project
- * @return
- * @throws CoreException
- * @throws NullPointerException if <code>project</code> is null
- */
- public boolean isFacetedProject(IProject project) throws CoreException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java
deleted file mode 100755
index 32eda2b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationBase;
-
-/**
- * Base {@link IAnnotationBase} implementation
- *
- * @author Plamen Pavlov
- */
-public abstract class AnnotationBaseImpl<T extends IJavaElement> extends ValueImpl
-{
- private String annotationName;// Container for Annotation Name;
- protected T javaElement; // Conatiner for the parent IJavaElement;
- //private String annotationStringValue;//Conatiner to current String representation of this annotation
-
- private static final String DOT = "."; //$NON-NLS-1$
-
- /**
- * Constructor.
- *
- * @param annotationName
- *
- * @throws NullPointerException in case <code>annotationName</code> is null.
- * @throws IllegalArgumentException in case <code>annotationName</code> is empty String.
- */
- public AnnotationBaseImpl(String annotationName)
- {
- this.annotationName = annotationName;
- }
-
- /**
- * Extracts only the Annotation name in case it is in fully qualified form.
- *
- * @return the simple Annotation name.
- */
- public String getSimpleAnnotationName()
- {
- int lastDotIndex = annotationName.lastIndexOf(DOT);
-
- if (lastDotIndex == -1)
- {
- return annotationName;
- }
-
- return annotationName.substring(lastDotIndex + 1);
- }
-
- public String getAnnotationName()
- {
- return annotationName;
- }
-
- /**
- * Adds Annotation to specific IJavaElement.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- */
- public void setAppliedElementWithoutSave(T javaElement)
- {
- setJavaElement(javaElement);
- }
-
- public void setJavaElement(T javaElement)
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
-
- this.javaElement = javaElement;
- }
-
- @Override
- public int hashCode()
- {
- return annotationName.hashCode();
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final AnnotationBaseImpl<T> other = (AnnotationBaseImpl<T>)obj;
- return annotationName.equals(other.annotationName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java
deleted file mode 100755
index 5d3b5a3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Arrays;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-
-/**
- * An implementation of {@link IAnnotation}
- *
- * @author Plamen Pavlov
- */
-public class AnnotationImpl<T extends IJavaElement> extends AnnotationBaseImpl<T> implements IAnnotation<T>
-{
-
- /**
- * @see org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation#getPropertyValue(java.lang.String)
- */
- public String getPropertyValue(String param)
- {
- for (IParamValuePair pair : getParamValuePairs())
- {
- if (param.equals(pair.getParam()))
- {
- return pair.getValue()!=null ? pair.getValue().toString() : null;
- }
- }
- return null;
- }
-
- private Set<IParamValuePair> paramValuePairs;
-
- /**
- * Constructor
- *
- * @param annotationName -
- * the name of annotation
- * @param paramValuePairs -
- * the param=value paris
- */
- public AnnotationImpl(String annotationName, Set<IParamValuePair> paramValuePairs)
- {
- super(annotationName);
- this.paramValuePairs = paramValuePairs;
- }
-
- public Set<IParamValuePair> getParamValuePairs()
- {
- return paramValuePairs;
- }
-
- public void setParamValuePairs(Set<IParamValuePair> paramValuePairs)
- {
- this.paramValuePairs = paramValuePairs;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Expression getExpression(CompilationUnit unit, AST ast)
- {
- NormalAnnotation annot = ast.newNormalAnnotation();
- boolean wasAdded = addImports(ast, unit, getAnnotationName());
- if (wasAdded)
- {
- ((SimpleName) annot.getTypeName()).setIdentifier(getSimpleAnnotationName());
- } else
- {
- Name name = ast.newName(getAnnotationName());
- annot.setTypeName(name);
- }
- for (IParamValuePair paramValuePair : paramValuePairs)
- {
- MemberValuePair pair = ast.newMemberValuePair();
- pair.getName().setIdentifier(paramValuePair.getParam());
- pair.setValue(((ValueImpl) paramValuePair.getValue()).getExpression(unit, ast));
- annot.values().add(pair);
- }
- return annot;
- }
-
- @Override
- public int hashCode()
- {
- if(paramValuePairs == null || paramValuePairs.size() < 1)
- {
- return 31 * super.hashCode();
- }
- return 31 * super.hashCode() + Arrays.hashCode(paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()]));
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (!super.equals(obj))
- {
- return false;
- }
- final AnnotationImpl<?> other = (AnnotationImpl<?>) obj;
- return (Arrays.equals(paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()]), other.paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()])));
- }
-
- public T getAppliedElement()
- {
- return this.javaElement;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java
deleted file mode 100755
index 2c867e1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.QualifiedType;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-
-/**
- * Class, which is made to load and return annotations from a given IJavaElemet.
- *
- * @author Plamen Pavlov
- */
-public class AnnotationInspectorImpl implements IAnnotationInspector
-{
- private IType iType;
- private CompilationUnit cUnit;
-
- public AnnotationInspectorImpl(final IType type)
- {
- ContractChecker.nullCheckParam(type, "type"); //$NON-NLS-1$
-
- this.iType = type;
- }
-
- public IAnnotation<IMethod> inspectMethod(final IMethod method, final String annotationQName) throws JavaModelException
- {
- ContractChecker.nullCheckParam(method, "method"); //$NON-NLS-1$
- ContractChecker.nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
- if(!(method instanceof IMethod))
- {
- throw new IllegalArgumentException("method argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- return getSpecificAnnotationFromMember(method, method.getParent().getElementName(), annotationQName);
- }
-
- public Collection<IAnnotation<IMethod>> inspectMethod(IMethod method) throws JavaModelException
- {
- ContractChecker.nullCheckParam(method, "method"); //$NON-NLS-1$
-
- if(!(method instanceof IMethod))
- {
- throw new IllegalArgumentException("method argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- return getFromMember(method, method.getParent().getElementName());
- }
-
- public IAnnotation<IField> inspectField(final IField field, final String annotationQName) throws JavaModelException
- {
- nullCheckParam(field, "field"); //$NON-NLS-1$
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if(!(field instanceof IField))
- {
- throw new IllegalArgumentException("field argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- final String className = field.getParent().getElementName();
- return getSpecificAnnotationFromMember(field, className, annotationQName);
- }
-
- public Collection<IAnnotation<IField>> inspectField(IField field) throws JavaModelException
- {
- if (field == null)
- {
- throw new NullPointerException("field should not be null!"); //$NON-NLS-1$
- }
- if(!(field instanceof IField))
- {
- throw new IllegalArgumentException("field argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- final String className = field.getParent().getElementName();
- return getFromMember(field, className);
- }
-
- public IAnnotation<ITypeParameter> inspectParam(final ITypeParameter param, final String annotationQName) throws JavaModelException
- {
- nullCheckParam(param, "param"); //$NON-NLS-1$
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if(!(param instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("param argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- final String className = getClassNameFromParam(param);
- return getSpecificAnnotationFromMember(param, className, annotationQName);
- }
-
- public Collection<IAnnotation<ITypeParameter>> inspectParam(ITypeParameter param) throws JavaModelException
- {
- if (param == null)
- {
- throw new NullPointerException("param should not be null!"); //$NON-NLS-1$
- }
- if(!(param instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("param argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- return getFromMember(param, getClassNameFromParam(param));
- }
-
- public IAnnotation<IType> inspectType(final String annotationQName) throws JavaModelException
- {
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if (annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- return getSpecificAnnotationFromMember(iType, iType.getElementName(), annotationQName);
- }
-
- public Collection<IAnnotation<IType>> inspectType() throws JavaModelException
- {
- return getFromMember(iType, iType.getElementName());
- }
-
- // # implementation
-
- private String getClassNameFromParam(final ITypeParameter param) throws JavaModelException
- {
- if(param.getDeclaringMember() instanceof IMethod)
- {
- return param.getDeclaringMember().getParent().getElementName();
- }
-
- return param.getDeclaringMember().getElementName();
- }
-
- protected <T extends IJavaElement> Set<IAnnotation<T>> getFromMember(T type, String className) throws JavaModelException
- {
- if (!isSupportedJavaElement(type)) {
- throw new IllegalArgumentException("passed argument is not of correct type."); //$NON-NLS-1$
- }
-
- ICompilationUnit cUnit = null;
- if(type instanceof IMember) {
- cUnit = ((IMember)type).getCompilationUnit();
- }
- else {
- cUnit = ((ITypeParameter)type).getDeclaringMember().getCompilationUnit();
- }
-
- if (cUnit == null) {
- return new HashSet<IAnnotation<T>>();
- }
-
- final CompilationUnit unit = getCompilationUnit();
- final AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
-
- switch(type.getElementType())
- {
- case IJavaElement.TYPE:
- return getAnnotations(type, typeDeclaration);
-
- case IJavaElement.FIELD:
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration((IField) type, (TypeDeclaration)typeDeclaration);
- return getAnnotations(type, fieldDeclaration);
-
- case IJavaElement.METHOD:
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) type, (TypeDeclaration)typeDeclaration);
- return getAnnotations(type, methodDeclaration);
-
- case IJavaElement.TYPE_PARAMETER:
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod)((ITypeParameter) type).getParent(), (TypeDeclaration)typeDeclaration);
- return getParamAnnotations(type, methodDeclaration);
- }
-
- return new HashSet<IAnnotation<T>>();
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> getAnnotations(T iMember, BodyDeclaration bodyDeclaration) throws JavaModelException
- {
- if (bodyDeclaration != null)
- {
- List list = bodyDeclaration.modifiers();
- return extractAnnotations(iMember, list);
- }
- return new HashSet<IAnnotation<T>>();
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> getParamAnnotations(T iMember, MethodDeclaration methodDeclaration) throws JavaModelException
- {
- if (methodDeclaration != null)
- {
- for (Object param : methodDeclaration.parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)iMember).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- List list = ((SingleVariableDeclaration) param).modifiers();
-
- return extractAnnotations(iMember, list);
- }
- }
- }
- return new HashSet<IAnnotation<T>>();
- }
-
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> extractAnnotations(T iMember, List list) throws JavaModelException
- {
- Iterator iter = list.iterator();
- Set<IValue> values = new HashSet<IValue>();
- while (iter.hasNext())
- {
- IExtendedModifier element = (IExtendedModifier) iter.next();
- if (element.isAnnotation())
- {
- values.add(convertExpression((Expression) element));
- }
- }
-
- Set<IAnnotation<T>> expressions = new HashSet<IAnnotation<T>>();
- for (IValue value : values)
- {
- AnnotationImpl<T> ann = (AnnotationImpl<T>)value;
- ann.setAppliedElementWithoutSave(iMember);
- expressions.add(ann);
- }
- return expressions;
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> IAnnotation<T> extractSpecificAnnotation(T iMember, List list, IType type, String annotationQName) throws JavaModelException
- {
- Iterator iter = list.iterator();
- Set<IValue> values = new HashSet<IValue>();
- while (iter.hasNext())
- {
- IExtendedModifier element = (IExtendedModifier) iter.next();
- if (element.isAnnotation())
- {
- final Name typeName = ((Annotation)element).getTypeName();
- if (annotationQName.endsWith(typeName.getFullyQualifiedName())) {
- values.add(convertExpression((Expression) element));
- }
- }
- }
-
- for (IValue value : values)
- {
- AnnotationImpl<T> tmpAnnotation = (AnnotationImpl<T>)value;
- if(checkSpecificAnnotattion(tmpAnnotation, type, annotationQName))
- {
- AnnotationImpl<T> result = new AnnotationImpl<T>(annotationQName, tmpAnnotation.getParamValuePairs());
- result.setAppliedElementWithoutSave(iMember);
- result.setLocator(tmpAnnotation.getLocator());
- return result;
- }
- }
- return null;
- }
-
- private <T extends IJavaElement> boolean checkSpecificAnnotattion(final AnnotationImpl<T> annotation, final IType type, final String annotationQName) throws JavaModelException
- {
- if(annotation.getAnnotationName().equals(annotationQName) ||
- (type.getPackageFragment().getElementName() + "." + annotation.getAnnotationName()).equals(annotationQName)) //$NON-NLS-1$
- {
- return true;
- }
-
- ICompilationUnit cUnit = type.getCompilationUnit();
- IImportDeclaration[] imports = cUnit.getImports();
- for (IImportDeclaration importDeclaration : imports)
- {
- if(annotationQName.endsWith(annotation.getAnnotationName()) && importDeclaration.getElementName().equals(annotationQName))
- {
- return true;
- }
- }
-
- for (IImportDeclaration importDeclaration : imports)
- {
- if(importDeclaration.getElementName().endsWith("*")) //$NON-NLS-1$
- {
- String importStr = importDeclaration.getElementName().substring(0, importDeclaration.getElementName().length() - 1);
- if(annotationQName.endsWith(annotation.getAnnotationName()) && annotationQName.indexOf(importStr) == 0)
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private IValue convertExpression(Expression element) throws JavaModelException
- {
- switch (element.getNodeType())
- {
- case ASTNode.MARKER_ANNOTATION:
- {
- MarkerAnnotation ma = (MarkerAnnotation) element;
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(ma), new HashSet<IParamValuePair>());
- annotation.setLocator(createLocator(ma));
- return annotation;
- }
- case ASTNode.SINGLE_MEMBER_ANNOTATION:
- {
- final SingleMemberAnnotation sma = (SingleMemberAnnotation) element;
- final Set<IParamValuePair> values = new HashSet<IParamValuePair>();
-
- final IValue value = convertExpression(sma.getValue());
- if (value!=null) {
- values.add(AnnotationFactory.createParamValuePairValue("value", value)); //$NON-NLS-1$
- }
-
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(sma), values);
- annotation.setLocator(createLocator(sma));
- return annotation;
- }
- case ASTNode.NORMAL_ANNOTATION:
- {
- return getNormalAnnotationValue((NormalAnnotation) element);
- }
- case ASTNode.ARRAY_INITIALIZER:
- {
- ArrayInitializer arr = (ArrayInitializer) element;
- List<Expression> list = arr.expressions();
- Iterator<Expression> iter = list.iterator();
- Set<IValue> result = new HashSet<IValue>();
- while (iter.hasNext())
- {
- Expression expr = (Expression) iter.next();
- result.add(convertExpression(expr));
- }
- return new ArrayValueImpl(result);
- }
- case ASTNode.NULL_LITERAL:
- {
- // return AnnotationFactory.createNullValue();
- break;
- }
- case ASTNode.SIMPLE_NAME:
- {
- break;//return new StringValueImpl(((SimpleName)element).getIdentifier());
- }
- case ASTNode.TYPE_LITERAL:
- {
- return getTypeLiteralValue((TypeLiteral) element);
- }
- case ASTNode.QUALIFIED_NAME:
- {
- QualifiedName qn = (QualifiedName) element;
- QualifiedNameValueImpl qnValue = new QualifiedNameValueImpl(qn.getFullyQualifiedName());
- qnValue.setLocator(createLocator(qn));
- return qnValue;
- }
- case ASTNode.BOOLEAN_LITERAL:
- {
- BooleanLiteral bl = (BooleanLiteral) element;
- BooleanValueImpl bValue = new BooleanValueImpl(bl.booleanValue());
- bValue.setLocator(createLocator(bl));
- return bValue;
- }
- case ASTNode.CHARACTER_LITERAL:
- {
- // CharacterLiteral cl = (CharacterLiteral) element;
- // TODO Finish with this return new CharacterValue(cl.charValue());
- break;
- }
- case ASTNode.NUMBER_LITERAL:
- {
- NumberLiteral nl = (NumberLiteral) element;
- IntegerValueImpl intValue = new IntegerValueImpl(nl.getToken());
- intValue.setLocator(createLocator(nl));
- return intValue;
- }
- case ASTNode.STRING_LITERAL:
- {
- StringLiteral sl = (StringLiteral) element;
- StringValueImpl strValue = new StringValueImpl(sl.getLiteralValue());
- strValue.setLocator(createLocator(sl));
- return strValue;
- }
- }
- return null;
- }
-
- private IValue getTypeLiteralValue(TypeLiteral tl) throws JavaModelException
- {
- Type type = tl.getType();
- Name name = null;
- if (type.isQualifiedType())
- {
- name = ((QualifiedType) type).getName();
- } else
- {
- if (type.isSimpleType())
- {
- name = ((SimpleType) type).getName();
- }
- }
- if (name != null)
- {
- CompilationUnit cu = getCompilationUnit(tl);
- if (cu != null)
- {
- String fullyQualifiedName = name.getFullyQualifiedName();
- if (type.isSimpleType())
- {
- fullyQualifiedName = resolveType((ICompilationUnit) cu.getJavaElement(), fullyQualifiedName);
- }
-
- ClassValueImpl cValue = new ClassValueImpl(fullyQualifiedName);
- cValue.setLocator(createLocator(tl));
- return cValue;
- }
- }
-
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private IValue getNormalAnnotationValue(NormalAnnotation na) throws JavaModelException
- {
- List<MemberValuePair> l = na.values();
- Iterator<MemberValuePair> iter = l.iterator();
- Set<IParamValuePair> result = new HashSet<IParamValuePair>();
- while (iter.hasNext())
- {
- MemberValuePair mvp = (MemberValuePair) iter.next();
- IValue mvpval = convertExpression(mvp.getValue());
- ParamValuePairImpl pair = new ParamValuePairImpl(mvp.getName().getIdentifier(), mvpval);
- pair.setLocator(createLocator(mvp));
- result.add(pair);
- }
-
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(na), result);
- annotation.setLocator(createLocator(na));
- return annotation;
- }
-
- private String getFullyQualifiedAnnotationName(Annotation anno) throws JavaModelException
- {
- Name typeName = anno.getTypeName();
- String fullyQualifiedName = typeName.getFullyQualifiedName();
- if (typeName.isSimpleName())
- {
- CompilationUnit cu = getCompilationUnit(anno);
- fullyQualifiedName = resolveType((ICompilationUnit) cu.getJavaElement(), fullyQualifiedName);
- }
- return fullyQualifiedName;
- }
-
- private CompilationUnit getCompilationUnit(Expression element)
- {
- ASTNode cu = element;
- while (cu != null && !(cu instanceof CompilationUnit))
- {
- cu = cu.getParent();
- }
- return (CompilationUnit) cu;
- }
-
- private String resolveType(ICompilationUnit icu, String fullyQualifiedName) throws JavaModelException
- {
- String localFullyQualifiedName = fullyQualifiedName;
- IType[] allTypes = icu.getAllTypes();
- if (allTypes == null)
- {
- return localFullyQualifiedName;
- }
-
- for (int i = 0; i < allTypes.length; i++)
- {
- String[][] resolvedType = allTypes[i].resolveType(localFullyQualifiedName);
- if (resolvedType != null && resolvedType.length > 0)
- {
- StringBuffer buf = new StringBuffer();
- for (int j = 0; j < resolvedType[0].length; j++)
- {
- buf = appendDot(j, buf);
- buf.append(resolvedType[0][j]);
- }
- localFullyQualifiedName = buf.toString();
- break;
- }
- }
-
- return localFullyQualifiedName;
- }
-
- private StringBuffer appendDot(int index, StringBuffer buff)
- {
- StringBuffer result = buff;
- if (index != 0)
- {
- result.append('.');
- }
- return result;
- }
-
- protected <T extends IJavaElement> IAnnotation<T> getSpecificAnnotationFromMember(final T type, final String className, final String annotationQName) throws JavaModelException
- {
- if (!isSupportedJavaElement(type))
- {
- throw new IllegalArgumentException("passed argument is not of correct type."); //$NON-NLS-1$
- }
-
- ICompilationUnit cUnit = null;
- if (type instanceof IMember) {
- cUnit = ((IMember)type).getCompilationUnit();
- }
- else {
- cUnit = ((ITypeParameter)type).getDeclaringMember().getCompilationUnit();
- }
-
- if (cUnit == null) {
- return null;
- }
-
- final CompilationUnit unit = getCompilationUnit();
- final AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
-
- switch(type.getElementType())
- {
- case IJavaElement.TYPE:
- return getSpecificAnnotation(type, typeDeclaration, (IType)type, annotationQName);
-
- case IJavaElement.FIELD:
- IField field = (IField) type;
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration)typeDeclaration);
- return getSpecificAnnotation(type, fieldDeclaration, field.getDeclaringType(), annotationQName);
-
- case IJavaElement.METHOD:
- IMethod method = (IMethod) type;
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration)typeDeclaration);
- return getSpecificAnnotation(type, methodDeclaration, method.getDeclaringType(), annotationQName);
-
- case IJavaElement.TYPE_PARAMETER:
- method = (IMethod)((ITypeParameter) type).getParent();
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration)typeDeclaration);
- return getSpecificParamAnnotation(type, methodDeclaration, method.getDeclaringType(), annotationQName);
- }
-
- return null;
- }
-
- private <T extends IJavaElement> IAnnotation<T> getSpecificAnnotation(final T iMember, final BodyDeclaration bodyDeclaration, final IType type, final String annotationQName) throws JavaModelException
- {
- if (bodyDeclaration != null)
- {
- @SuppressWarnings("unchecked")
- final List list = bodyDeclaration.modifiers();
- return extractSpecificAnnotation(iMember, list, type, annotationQName);
- }
- return null;
- }
-
- private <T extends IJavaElement> IAnnotation<T> getSpecificParamAnnotation(T iMember, MethodDeclaration methodDeclaration, final IType type, final String annotationQName) throws JavaModelException
- {
- if (methodDeclaration != null)
- {
- for (Object param : methodDeclaration.parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)iMember).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- @SuppressWarnings("unchecked")
- final List list = ((SingleVariableDeclaration) param).modifiers();
-
- return extractSpecificAnnotation(iMember, list, type, annotationQName);
- }
- }
- }
- return null;
- }
-
- private boolean isSupportedJavaElement(final IJavaElement javaElement)
- {
- return javaElement.getElementType()==IJavaElement.METHOD ||
- javaElement.getElementType()==IJavaElement.TYPE ||
- javaElement.getElementType()==IJavaElement.FIELD ||
- javaElement.getElementType()==IJavaElement.TYPE_PARAMETER;
- }
-
- private CompilationUnit getCompilationUnit()
- {
- if (cUnit==null) {
- cUnit = ASTUtils.getInstance().createCompilationUnit(iType.getCompilationUnit(), null);
- }
-
- return cUnit;
- }
-
- private ILocator createLocator(final ASTNode node)
- {
- final int lineNumber = getCompilationUnit().getLineNumber(node.getStartPosition());
- return new LocatorImpl(lineNumber, node.getStartPosition(), node.getLength());
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java
deleted file mode 100755
index 3c17bfc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationProperty;
-
-
-public class AnnotationProperty implements IAnnotationProperty
-{
- private String annotationName;
- private String attributeName;
- private String value;
- private AttributeTypeEnum attributeType;
-
- /**
- * Public constructor for AnnotationProperty objects
- *
- * @param annotationName - String representation of the Name for the Annotation.
- * @param attributeName - String representation of the Name for the Attribute.
- * @param value - String representation of the Value for the Attribute.
- */
- public AnnotationProperty(final String annotationName, final String attributeName, final String value, final AttributeTypeEnum attributeType)
- {
- this.annotationName = annotationName;
- this.attributeName = attributeName;
- this.value = value;
- this.attributeType = attributeType;
- }
-
- public String getAnnotationName()
- {
- return this.annotationName;
- }
-
- public String getAttributeName()
- {
- return this.attributeName;
- }
-
- public String getValue()
- {
- return this.value;
- }
-
- public AttributeTypeEnum getAttributeType()
- {
- return this.attributeType;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java
deleted file mode 100755
index 5b018cd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.lang.annotation.ElementType;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationPropertyContainer;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class AnnotationPropertyContainer implements IAnnotationPropertyContainer
-{
- private Map<String, Set<IParamValuePair>> typeAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
- private Map<String, Set<IParamValuePair>> methodAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
- private Map<String, Set<IParamValuePair>> parameterAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
-
- /**
- * Add Annotation Property to the container.
- *
- * @throws NullPointerException if the <code>target</code> or <code>annotationProperty</code> is <code>null</code>.
- */
- public void addAnnotationProperty(final AnnotationProperty annotationProperty, final ElementType target)
- {
- if(annotationProperty == null)
- {
- throw new NullPointerException("annotationProperty could not be null!"); //$NON-NLS-1$
- }
- if(target == null)
- {
- throw new NullPointerException("target could not be null!"); //$NON-NLS-1$
- }
-
- if(!(target.equals(ElementType.TYPE)) && !(target.equals(ElementType.METHOD)) && !(target.equals(ElementType.PARAMETER)))
- {
- throw new IllegalArgumentException("target parameter is not of correct type"); //$NON-NLS-1$
- }
- Map<String, Set<IParamValuePair>> annotationName2ParamValuesMap = null;
-
- if(target.equals(ElementType.TYPE))
- {
- annotationName2ParamValuesMap = typeAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.METHOD))
- {
- annotationName2ParamValuesMap = methodAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.PARAMETER))
- {
- annotationName2ParamValuesMap = parameterAnnotationName2ParamValuesMap;
- }
-
-
- Set<IParamValuePair> paramValuesSet = annotationName2ParamValuesMap.get(annotationProperty.getAnnotationName());
- if(paramValuesSet == null)
- {
- paramValuesSet = new HashSet<IParamValuePair>();
- annotationName2ParamValuesMap.put(annotationProperty.getAnnotationName(), paramValuesSet);
- }
-
- IValue value = null;
- if(annotationProperty.getAttributeType() == null)
- {
- return;
- }
-
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.BOOLEAN))
- {
- value = AnnotationFactory.createBooleanValue(new Boolean(annotationProperty.getValue()));
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.CLASS))
- {
- //TODO change this!!!!!!
- //value = AnnotationFactory.createClassValue(annotationProperty.getValue());
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.INTEGER))
- {
- value = AnnotationFactory.createIntegerValue(annotationProperty.getValue());
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.QUALIFIED_NAME))
- {
- value = AnnotationFactory.createQualifiedNameValue(annotationProperty.getValue());
- }
- if(value == null)
- {
- value = AnnotationFactory.createStringValue(annotationProperty.getValue());
- }
-
- IParamValuePair paramValuePair = AnnotationFactory.createParamValuePairValue(annotationProperty.getAttributeName(), value);
-
- paramValuesSet.add(paramValuePair);
- }
- /**
- * @param ITypeParameter
- * @return Set with all Annotation from the container, which are ITypeParameter relevant.
- */
- public Set<IAnnotation<ITypeParameter>> getParameterAnnotations(ITypeParameter tParam)
- {
- return getAnnotations(ElementType.PARAMETER, tParam);
- }
-
- /**
- * @return Set with all Annotation from the container, which are IType relevant.
- */
- public Set<IAnnotation<IType>> getTypeAnnotations(IType type)
- {
- return getAnnotations(ElementType.TYPE, type);
- }
-
- /**
- * @return Set with all Annotation from the container, which are IMethod relevant.
- */
- public Set<IAnnotation<IMethod>> getMethodAnnotations(IMethod method)
- {
- return getAnnotations(ElementType.METHOD , method);
- }
-
- private <T extends IJavaElement> Set<IAnnotation<T>> getAnnotations(final ElementType target, final T iTarget)
- {
- if(!(target.equals(ElementType.TYPE)) && !(target.equals(ElementType.METHOD)) && !(target.equals(ElementType.PARAMETER)))
- {
- throw new IllegalArgumentException("target parameter is not of correct type"); //$NON-NLS-1$
- }
-
- Map<String, Set<IParamValuePair>> annotationName2ParamValuesMap = null;
- if(target.equals(ElementType.TYPE))
- {
- annotationName2ParamValuesMap = typeAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.METHOD))
- {
- annotationName2ParamValuesMap = methodAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.PARAMETER))
- {
- annotationName2ParamValuesMap = parameterAnnotationName2ParamValuesMap;
- }
- Set<IAnnotation<T>> result = new HashSet<IAnnotation<T>>();
- Set<String> keys = annotationName2ParamValuesMap.keySet();
- for (String key : keys)
- {
- Set<IParamValuePair> paramValuePairsSet = annotationName2ParamValuesMap.get(key);
- IAnnotation<T> annotation = AnnotationFactory.createAnnotation(key, paramValuePairsSet, iTarget);
- result.add(annotation);
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java
deleted file mode 100755
index c855a1b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.io.FileNotFoundException;
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.resources.EditResourcesManager;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.IFileUtils;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Contains utilities for getting AST objects needed in annotation processing
- *
- * @author Plamen Pavlov
- */
-public class AnnotationUtils
-{
- private static AnnotationUtils utils = null;
- private final IFileUtils fileUtils = FileUtils.getInstance();
-
- /**
- * The factory method.
- *
- * @return a AnnotationUtils instance.
- */
- public static AnnotationUtils getInstance()
- {
- if (utils == null)
- {
- utils = new AnnotationUtils();
- }
- return utils;
- }
-
- /**
- * Gets IDocument, which coresponds to one CompilationUnit.
- *
- * @param unit -
- * Compilation Unit, which will be used as starting point to get the IDocument.
- *
- * @return IDocument which is found.
- *
- * @throws CoreException
- */
- public IDocument getDocument(ICompilationUnit unit) throws CoreException
- {
- String source = unit.getBuffer().getContents();
- return new Document(source);
- }
-
- /**
- * Removes Annotations of specified IJavaElement.
- *
- * @param javaElement - IJavaElement which will be used as starting poin for removing the annotations.
- * @param annotations - Set which contains String values for the annotations which will be removed. If this Set is empty all Annotations will be removed.
- * @param deepRemove - Boolean value, representing whether Annotations from javaElemet childs will be removed.
- * @throws AnnotationGeneratorException
- *
- * @throws AnnotationGeneratorException
- * thown if AST TypeDeclaration cannot be found for <code>type</code> and also is used as wrapper in case {@link CoreException} or
- * {@link BadLocationException} is thrown while processing.
- * @throws BadLocationException
- * @throws CoreException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void removeAnnotations(IJavaElement javaElement, Set<String> annotations, boolean deepRemove) throws AnnotationGeneratorException, MalformedTreeException, FileNotFoundException, CoreException, BadLocationException
- {
- if(javaElement instanceof IType)
- {
- IType type = (IType)javaElement;
- ICompilationUnit cUnit = type.getCompilationUnit();
- String className = type.getElementName();
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
-
- AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration == null)
- {
- throw new AnnotationGeneratorException("typeDeclaration should not be null",//$NON-NLS-1$
- MessageFormat.format(JaxWsUtilMessages.AnnotationUtils_ParamShouldNotBeNullMsg, "typeDeclaration")); //$NON-NLS-1$
- }
-
- removeTypeAnnotations(type, typeDeclaration, unit, cUnit, annotations);
-
- if(!deepRemove)
- {
- return;
- }
-
- IField[] tmpFields = type.getFields();
- if (tmpFields != null && tmpFields.length > 0)
- {
- for (IField tmpField : tmpFields)
- {
- removeFieldAnnotations(tmpField, type, cUnit, annotations);
- }
- }
-
- IMethod[] tmpMethods = type.getMethods();
- if (tmpMethods != null && tmpMethods.length > 0)
- {
- for (IMethod tmpMethod : tmpMethods)
- {
- removeMethodAnnotations(tmpMethod, type, cUnit, annotations);
-
- //Remove params annotations
- for (String paramName : tmpMethod.getParameterNames())
- {
- ITypeParameter typeParameter = tmpMethod.getTypeParameter(paramName);
- removeParamAnnotations(typeParameter, type, cUnit, annotations, paramName);
- }
- }
- }
- }
-
- if(javaElement instanceof IField)
- {
- IField field = (IField)javaElement;
- IType declaringType = field.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeFieldAnnotations(field, declaringType, declaringTypeCompUnit, annotations);
- }
-
- if(javaElement instanceof IMethod)
- {
- IMethod method = (IMethod)javaElement;
- IType declaringType = method.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeMethodAnnotations(method, declaringType, declaringTypeCompUnit, annotations);
- if(!deepRemove)
- {
- return;
- }
-
- //Remove params annotations
- for (String paramName: method.getParameterNames())
- {
- ITypeParameter param = method.getTypeParameter(paramName);
- removeParamAnnotations(param, declaringType, declaringTypeCompUnit, annotations, paramName);
- }
- }
-
- if(javaElement instanceof ITypeParameter)
- {
- ITypeParameter typeParameter = (ITypeParameter)javaElement;
- IMethod tmpMethod = (IMethod) typeParameter.getDeclaringMember();
- //TODO check this
- //param.getParent();
- IType declaringType = tmpMethod.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
- //TODO FIX THIS
- removeParamAnnotations(typeParameter, declaringType, declaringTypeCompUnit, annotations, null);
- }
- }
-
- private void removeTypeAnnotations(IType type, AbstractTypeDeclaration typeDeclaration, CompilationUnit unit, ICompilationUnit cUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- unit.recordModifications();
- if (removeAnnotations(typeDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(cUnit, doc);
- }
- }
-
- private void removeFieldAnnotations(IField field, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit fcUnit = field.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit fUnit = ASTUtils.getInstance().createCompilationUnit(fcUnit, null);
-
- BodyDeclaration fBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, fUnit);
- fBodyDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration) fBodyDeclaration);
-
- fUnit.recordModifications();
- if (removeAnnotations(fBodyDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = fUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeMethodAnnotations(IMethod method, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit mcUnit = method.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
- if (removeAnnotations(mBodyDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeParamAnnotations(ITypeParameter param, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet, String paramName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- IMethod tmpMethod = (IMethod)param.getDeclaringMember();
- //TODO check this
- //param.getParent();
- String className = declaringType.getElementName();
- ICompilationUnit mcUnit = tmpMethod.getCompilationUnit();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(tmpMethod, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
-
- for (Object object : ((MethodDeclaration) mBodyDeclaration).parameters())
- {
- if (object instanceof SingleVariableDeclaration)
- {
- SingleVariableDeclaration svd = (SingleVariableDeclaration) object;
- if ((paramName == null || svd.getName().toString().equals(paramName)) &&
- removeAnnotations(svd.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
- }
- }
-
- private void saveContent(ICompilationUnit cUnit, IDocument doc) throws FileNotFoundException, JavaModelException, AnnotationGeneratorException
- {
- IStatus status = (new EditResourcesManager()).setFileEditable((IFile) cUnit.getResource());
- if(status.getSeverity() == IStatus.OK )
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(cUnit, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- /**
- * Removes specific Annotation of specified IJavaElement.
- *
- * @param javaElement - IJavaElement which will be used as starting poin for removing the Annotation.
- * @param annotationName - String which is the representation Name of the Annotation, which will be removed.
- *
- * @throws AnnotationGeneratorException
- * @throws AnnotationGeneratorException
- * thown if AST TypeDeclaration cannot be found for <code>type</code> and also is used as wrapper in case {@link CoreException} or
- * {@link BadLocationException} is thrown while processing.
- * @throws BadLocationException
- * @throws CoreException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void removeAnnotation(IJavaElement javaElement, String annotationName) throws AnnotationGeneratorException, FileNotFoundException, CoreException, BadLocationException
- {
- if(javaElement instanceof IType)
- {
- IType type = (IType)javaElement;
- ICompilationUnit cUnit = type.getCompilationUnit();
- String className = type.getElementName();
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
-
- AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration == null)
- {
- throw new AnnotationGeneratorException("typeDeclaration should not be null", //$NON-NLS-1$
- MessageFormat.format(JaxWsUtilMessages.AnnotationUtils_ParamShouldNotBeNullMsg, "typeDeclaration")); //$NON-NLS-1$
- }
-
- removeTypeAnnotation(type, typeDeclaration, unit, cUnit, annotationName);
-
- }
-
- if(javaElement instanceof IField)
- {
- IField field = (IField)javaElement;
- IType declaringType = field.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeFieldAnnotation(field, declaringType, declaringTypeCompUnit, annotationName);
- }
-
- if(javaElement instanceof IMethod)
- {
- IMethod method = (IMethod)javaElement;
- IType declaringType = method.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeMethodAnnotation(method, declaringType, declaringTypeCompUnit, annotationName);
- }
-
- if(javaElement instanceof ITypeParameter)
- {
- ITypeParameter typeParameter = (ITypeParameter)javaElement;
- IMethod tmpMethod = (IMethod) typeParameter.getDeclaringMember();
- //TODO check this
- //param.getParent();
- IType declaringType = tmpMethod.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeParamAnnotation(typeParameter, declaringType, declaringTypeCompUnit, annotationName);
- }
- }
-
- private void removeTypeAnnotation(IType type, AbstractTypeDeclaration typeDeclaration, CompilationUnit unit, ICompilationUnit cUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- unit.recordModifications();
- if (removeAnnotation(typeDeclaration.modifiers(), annotationName))
- {
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(cUnit, doc);
- }
- }
-
- private void removeFieldAnnotation(IField field, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit fcUnit = field.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit fUnit = ASTUtils.getInstance().createCompilationUnit(fcUnit, null);
-
- BodyDeclaration fBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, fUnit);
- fBodyDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration) fBodyDeclaration);
-
- fUnit.recordModifications();
- if (removeAnnotation(fBodyDeclaration.modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = fUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeMethodAnnotation(IMethod method, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit mcUnit = method.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
- if(removeAnnotation(mBodyDeclaration.modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeParamAnnotation(ITypeParameter param, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- IMethod tmpMethod = (IMethod)param.getDeclaringMember();
- //TODO check this
- //param.getParent();
- String className = declaringType.getElementName();
- ICompilationUnit mcUnit = tmpMethod.getCompilationUnit();
- className = tmpMethod.getParent().getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(tmpMethod, (TypeDeclaration) mBodyDeclaration);
-
- mUnit.recordModifications();
- for (Object object : ((MethodDeclaration) mBodyDeclaration).parameters())
- {
- if (object instanceof SingleVariableDeclaration)
- {
- if (removeAnnotation(((SingleVariableDeclaration) object).modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
- }
- }
-
- /**
- * Removes specific annotation from the list of modifiers.
- *
- * @param modifiers
- * @param annotationName
- *
- * @return boolean value, which represents wheter the annotation is removed or not.
- */
- @SuppressWarnings("unchecked")
- private boolean removeAnnotation(List modifiers, String annotationName)
- {
- Annotation[] mAnnotations = extractAnnotations(modifiers);
- for (Annotation mAnnotation : mAnnotations)
- {
- if(validateAnnotatation(mAnnotation, annotationName))
- {
- modifiers.remove(mAnnotation);
- return true;
- }
- }
-
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private boolean removeAnnotations(List modifiers, Set<String> annotationsSet)
- {
- boolean changed = false;
- Annotation[] mAnnotations = extractAnnotations(modifiers);
- for (int mai = 0; mai < mAnnotations.length; mai++)
- {
- if (annotationsSet != null)
- {
- if (annotationsSet.contains(mAnnotations[mai].getTypeName().getFullyQualifiedName()))
- {
- modifiers.remove(mAnnotations[mai]);
- changed = true;
- }
- } else
- {
- modifiers.remove(mAnnotations[mai]);
- changed = true;
- }
- }
-
- return changed;
- }
-
- @SuppressWarnings("unchecked")
- private Annotation[] extractAnnotations(List modifiers)
- {
- Iterator iterator = modifiers.iterator();
- Set<Annotation> annotationsSet = new HashSet<Annotation>();
-
- while (iterator.hasNext())
- {
- IExtendedModifier modif = (IExtendedModifier) iterator.next();
- if (modif.isAnnotation())
- {
- annotationsSet.add((Annotation) modif);
- }
- }
-
- return annotationsSet.toArray(new Annotation[annotationsSet.size()]);
- }
-
- private boolean validateAnnotatation(Annotation mAnnotation, String annotationName)
- {
- String mAnnotationString = mAnnotation.toString();
- int index = mAnnotationString.indexOf("("); //$NON-NLS-1$
- if(index == -1)
- {
- mAnnotationString = mAnnotationString.trim();
- }
- else
- {
- mAnnotationString = mAnnotationString.substring(0, index).trim();
- }
-
- if(mAnnotationString.endsWith(annotationName))
- {
- return true;
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java
deleted file mode 100755
index 331862b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * Implementation for {@link IArrayValue}
- *
- * @author Plamen Pavlov
- */
-public class ArrayValueImpl extends ValueImpl
-{
- private Set<IValue> values = new HashSet<IValue>();
-
- /**
- * Construction
- *
- * @param values
- * @throws NullPointerException
- * in case <code>values</code> is <code>null</code>.
- */
- public ArrayValueImpl(Set<IValue> values)
- {
- if (values == null)
- {
- throw new NullPointerException("values should not be null"); //$NON-NLS-1$
- }
-
- this.values = values;
- }
-
- @Override
- public String toString()
- {
- String result = "["; //$NON-NLS-1$
- boolean first = true;
- for (IValue value : values)
- {
- if(first)
- {
- result = result + value.toString();
- first = false;
- }
- else
- {
- result = result + ", " + value.toString(); //$NON-NLS-1$
- }
- }
- result = result + "]"; //$NON-NLS-1$
- return result;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- //TODO check this method
- ArrayInitializer arr = ast.newArrayInitializer();
- for (IValue value : values)
- {
- arr.expressions().add(((ValueImpl) value).getExpression(unit, ast));
- }
-
- return arr;
- }
-
- @Override
- public int hashCode()
- {
- return Arrays.hashCode(values.toArray(new IValue[values.size()]));
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ArrayValueImpl other = (ArrayValueImpl) obj;
- return Arrays.equals(values.toArray(new IValue[values.size()]), other.values.toArray(new IValue[values.size()]));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java
deleted file mode 100755
index a0ba607..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-public enum AttributeTypeEnum
-{
- BOOLEAN("Boolean"), //$NON-NLS-1$
- CLASS("Class"), //$NON-NLS-1$
- INTEGER("Integer"), //$NON-NLS-1$
- QUALIFIED_NAME("Qualified Name"), //$NON-NLS-1$
- STRING("String"); //$NON-NLS-1$
-
- private final String value;
-
- AttributeTypeEnum(final String value)
- {
- this.value = value;
- }
-
- final String getValue()
- {
- return this.value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java
deleted file mode 100755
index 45fe1f9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Implementation for {@link IBooleanValue}
- *
- * @author Plamen Pavlov
- */
-public class BooleanValueImpl extends ValueImpl
-{ //$JL-EQUALS$
- private boolean value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public BooleanValueImpl(boolean value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- return ast.newBooleanLiteral(value);
- }
-
- @Override
- public String toString()
- {
- return Boolean.toString(value);
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final BooleanValueImpl other = (BooleanValueImpl) obj;
- return value == other.value;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java
deleted file mode 100755
index bdcea51..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-
-public class ClassValueImpl extends ValueImpl
-{
- private String classQName;
-
- public ClassValueImpl(String classQName)
- {
- this.classQName = classQName;
- }
-
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- String clsName = this.classQName;
- if (addImports(ast, unit, clsName))
- {
- clsName = getSimpleName(clsName);
- }
- Name name = ast.newName(clsName);
- SimpleType simpleType = ast.newSimpleType(name);
- TypeLiteral literal = ast.newTypeLiteral();
- literal.setType(simpleType);
- return literal;
- }
-
- @Override
- public String toString()
- {
- return this.classQName;
- }
-
- @Override
- public int hashCode()
- {
- return this.classQName.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ClassValueImpl other = (ClassValueImpl) obj;
- return this.classQName.equals(other.classQName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java
deleted file mode 100755
index faffe0f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-
-/**
- * Implementor for IIntegerValue
- *
- * @author Plamen Pavlov
- */
-public class IntegerValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public IntegerValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- NumberLiteral literal = ast.newNumberLiteral();
- literal.setToken(new Integer(value).toString());
- return literal;
- }
-
- @Override
- public int hashCode()
- {
- return new Integer(value);
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final IntegerValueImpl other = (IntegerValueImpl) obj;
- return value == other.value;
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java
deleted file mode 100755
index 89e859a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-
-/**
- * Implementor of {@link ILocator} interface
- */
-public class LocatorImpl implements ILocator
-{
- private int lineNumber;
- private int startPosition;
- private int length;
-
- public LocatorImpl(final int lineNumber, final int startPosition, final int length)
- {
- this.length = length;
- this.startPosition = startPosition;
- this.lineNumber = lineNumber;
- }
-
- public int getLength()
- {
- return this.length;
- }
-
- public int getStartPosition()
- {
- return this.startPosition;
- }
-
- public int getLineNumber()
- {
- return lineNumber;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java
deleted file mode 100755
index 9ce31d7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * @author Plamen Pavlov
- */
-
-public class ParamValuePairImpl implements IParamValuePair
-{
-
- private ILocator locator = null;
-
-
- private String param;
-
- private IValue value;
-
- /**
- * Constructor
- *
- * @param param
- * @param value
- */
- public ParamValuePairImpl(String param, IValue value)
- {
- this.param = param;
- this.value = value;
- }
-
- public String getParam()
- {
- return param;
- }
-
- public IValue getValue()
- {
- return value;
- }
-
- @Override
- public int hashCode()
- {
- if(value != null)
- {
- return 31 * param.hashCode() + value.hashCode();
- }
- else
- {
- return 31 * param.hashCode();
- }
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ParamValuePairImpl other = (ParamValuePairImpl) obj;
- if (!param.equals(other.param))
- {
- return false;
- }
- return value.equals(other.value);
- }
-
- public ILocator getLocator()
- {
- return this.locator;
- }
-
- public void setLocator(final ILocator locator)
- {
- this.locator = locator;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java
deleted file mode 100755
index 5bb66cf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Implementor for {@link IQualifiedNameValue}
- *
- * @author Plamen Pavlov
- */
-public class QualifiedNameValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public QualifiedNameValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- // "javax.ejb.TransactionAttributeType.REQUIRED"
- int i = value.lastIndexOf('.');
- if (i != -1)
- {
- String clsName = value.substring(0, i);
- if (addImports(ast, unit, clsName))
- {
- return ast.newName(getSimpleName(clsName) + value.substring(i));
- }
- }
- return ast.newName(value);
- }
-
- @Override
- public int hashCode()
- {
- return value.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final QualifiedNameValueImpl other = (QualifiedNameValueImpl) obj;
- return value.equals(other.value);
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java
deleted file mode 100755
index 58bd1b7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.StringLiteral;
-
-/**
- * Implementor for IStringValue
- *
- * @author Plamen Pavlov
- */
-public class StringValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public StringValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- StringLiteral literal = ast.newStringLiteral();
- literal.setLiteralValue(value);
- return literal;
- }
-
- @Override
- public int hashCode()
- {
- return value.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final StringValueImpl other = (StringValueImpl) obj;
- return value.equals(other.value);
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java
deleted file mode 100755
index 88c5715..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * @author Plamen Pavlov
- */
-
-public abstract class ValueImpl implements IValue
-{
- private ILocator locator = null;
-
- protected abstract Expression getExpression(CompilationUnit unit, AST ast);
-
-
- @SuppressWarnings("unchecked")
- protected boolean addImports(AST ast, CompilationUnit unit, String annotationName)
- {
- String packageAnnotationName = getPackageName(annotationName);
- if (packageAnnotationName == null)
- {
- return false;
- }
-
- if (packageAnnotationName.equals("java.lang")) //$NON-NLS-1$
- {
- return true;
- }
- if (unit != null)
- {
- ImportDeclaration imp = ast.newImportDeclaration();
- imp.setName(ast.newName(annotationName));
- List<ImportDeclaration> imports = unit.imports();
- String imp1 = getImport(imports, getSimpleName(annotationName));
- if (imp1 == null)
- {
- if (getOnDemandImport(imports, packageAnnotationName) == null)
- {
- imports.add(imp);
- }
- } else
- {
- if (!imp1.equals(annotationName))
- {
- return false;
- }
- }
- return true;
- }
-
- return false;
- }
-
- protected static String getImport(List<ImportDeclaration> imports, String imp)
- {
- Iterator<ImportDeclaration> iter = imports.iterator();
- while (iter.hasNext())
- {
- ImportDeclaration next = iter.next();
- Name fqName = next.getName();
- SimpleName name;
- if (fqName.isQualifiedName())
- {
- name = ((QualifiedName) fqName).getName();
- } else
- {
- name = (SimpleName) fqName;
- }
- String simpleName = name.getIdentifier();
- if (imp.equals(simpleName))
- {
- return fqName.getFullyQualifiedName();
- }
- }
- return null;
- }
-
- protected static String getOnDemandImport(List<ImportDeclaration> imports, String imp)
- {
- Iterator<ImportDeclaration> iter = imports.iterator();
- while (iter.hasNext())
- {
- ImportDeclaration next = iter.next();
- if (!next.isOnDemand())
- {
- continue;
- }
- Name fqName = next.getName();
- String name = fqName.getFullyQualifiedName();
- if (imp.equals(name))
- {
- return name;
- }
- }
- return null;
- }
-
- protected static String getPackageName(String name)
- {
- int i = name.lastIndexOf('.');
- if (i == -1)
- return null;
- return name.substring(0, i);
- }
-
- protected static String getSimpleName(String name)
- {
- int i = name.lastIndexOf('.');
- if (i == -1)
- return name;
- return name.substring(i + 1);
- }
-
- public ILocator getLocator()
- {
- return this.locator;
- }
-
- public void setLocator(final ILocator locator)
- {
- this.locator = locator;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java
deleted file mode 100755
index 44d3fa5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.ui.IStartup;
-import org.osgi.framework.BundleContext;
-
-public class JaxwsUtilsPlugin extends Plugin implements IStartup
-{
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.utils";
-
- // The shared instance
- private static JaxwsUtilsPlugin plugin;
-
- /**
- * The constructor
- */
- public JaxwsUtilsPlugin() {
- }
-
- /*
- * (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 JaxwsUtilsPlugin getDefault() {
- return plugin;
- }
-
- public void earlyStartup()
- {
- // Nothing to do. However, this pugin has to start as early as possible since its services will be used for common logging
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java
deleted file mode 100755
index bd4d368..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.text;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JaxWsUtilMessages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages"; //$NON-NLS-1$
-
-
- public static String CannotPerformEditMsg;
-
-
- public static String CompUnitMissingMsg;
-
-
- public static String InvalidTreeStateMsg;
-
-
- public static String AnnotationCannotBeStoredMsg;
-
-
- public static String AnnotationUtils_ParamShouldNotBeNullMsg;
-
- public static String EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG;
-
- public static String ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg;
-
- static
- {
- NLS.initializeMessages(BUNDLE_NAME, JaxWsUtilMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties
deleted file mode 100755
index 2dcfecd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-CannotPerformEditMsg = Edit cannot be performed
-CompUnitMissingMsg = Compilation unit file missing
-InvalidTreeStateMsg = Invalid project tree state
-AnnotationCannotBeStoredMsg = Annotation could not be stored, the file is not writable
-AnnotationUtils_ParamShouldNotBeNullMsg = {0} should not be null
-
-EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG = File contents could not be set
-ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg = project {0} does not have a META-INF folder
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java
deleted file mode 100755
index e7f92fb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.logging;
-
-public interface ILogger
-{
- /**
- * Logs a message with severity error.
- *
- * @param message
- * message to be logged
- */
- public void logError(final String message);
-
- /**
- * Logs a message with severity error.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logError(final String message, final Throwable cause);
-
- /**
- * Logs a message with severity warning.
- *
- * @param message
- * message to be logged
- */
- public void logWarn(final String message);
-
- /**
- * Logs a message with severity warning.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logWarn(final String message, final Throwable cause);
-
- /**
- * Logs a message with severity debug.
- *
- * @param message
- * message to be logged
- */
- public void logDebug(final String message);
-
- /**
- * Logs a message with severity debug.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logDebug(final String message, final Throwable cause);
-
-
- public boolean isDebug();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java
deleted file mode 100755
index efad315..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.logging;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.plugin.JaxwsUtilsPlugin;
-
-public class Logger implements ILogger
-{
- public void logDebug(String message)
- {
-// log().log(StatusUtils.statusInfo(message));
- }
-
- public void logDebug(String message, Throwable cause)
- {
-// log().log(StatusUtils.statusInfo(message, cause));
- }
-
- public void logError(String message)
- {
- log().log(StatusUtils.statusError(message));
- }
-
- public void logError(String message, Throwable cause)
- {
- log().log(StatusUtils.statusError(message, cause));
- }
-
- public void logWarn(String message)
- {
- log().log(StatusUtils.statusWarning(message));
- }
-
- public void logWarn(String message, Throwable cause)
- {
- log().log(StatusUtils.statusWarning(message, cause));
- }
-
- private ILog log()
- {
- return JaxwsUtilsPlugin.getDefault().getLog();
- }
-
- public boolean isDebug()
- {
- // TODO Auto-generated method stub
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java
deleted file mode 100755
index 26398a9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * This is an utility class which is meant to provide common functionality to save and modify resources. It is a wrapper of the eclipse API and
- * workarounds some DTR issues. Until DTR colleagues fix their coding, this manager must be used on each file modification occasion
- *
- * @author Danail Branekov
- */
-public class EditResourcesManager
-{
- private static final ILogger logger = new Logger();
-
- /**
- * Sets editability of a file. In case the file specified is already writable, <code>Status.OK_STATUS</code> is returned
- *
- * @param file
- * The file to be set editable
- * @param context
- * either {@link IWorkspace#VALIDATE_PROMPT}, or the <code>org.eclipse.swt.widgets.Shell</code> that is to be used to parent any
- * dialogs with the user, or <code>null</code> if there is no UI context (declared as an <code>Object</code> to avoid any direct
- * references on the SWT component)
- * @return the status of the operation
- * @throws NullPointerException
- * when the file specified is null
- * @see IWorkspace#VALIDATE_PROMPT
- */
- public IStatus setFileEditable(IFile file, Object context)
- {
- if (file == null)
- {
- throw new NullPointerException("file"); //$NON-NLS-1$
- }
- if(!file.isReadOnly())
- {
- return Status.OK_STATUS;
- }
-
- IWorkspace workspace = file.getWorkspace();
- return workspace.validateEdit(new IFile[] { file }, context);
- }
-
- /**
- * Sets editablility of a file. This is a convenience method equivalent to invoking
- * <code>setFileEditable(file, IWorkspace.VALIDATE_PROMPT)</code>
- *
- * @param file
- * The file to be set editable
- * @return the status of the operation
- * @throws NullPointerException
- * when the file specified is null
- * @see EditResourcesManager#setFileEditable(IFile, Object)
- * @see IWorkspace#VALIDATE_PROMPT
- *
- */
- public IStatus setFileEditable(IFile file)
- {
- return setFileEditable(file, IWorkspace.VALIDATE_PROMPT);
- }
-
- /**
- * Sets editablility of an array of files. In case all files specified are already writable, <code>Status.OK_STATUS</code> is returned
- *
- * @param files
- * The array of files to be set editable
- * @param context
- * either {@link IWorkspace#VALIDATE_PROMPT}, or the <code>org.eclipse.swt.widgets.Shell</code> that is to be used to parent any
- * dialogs with the user, or <code>null</code> if there is no UI context (declared as an <code>Object</code> to avoid any direct
- * references on the SWT component)
- * @return the status of the operation
- * @throws IllegalArgumentException
- * when the array is empty or null
- */
- public IStatus setFilesEditable(IFile[] files, Object context)
- {
- if (files == null || files.length == 0)
- {
- throw new IllegalArgumentException("Array must not be empty nor null"); //$NON-NLS-1$
- }
- List<IFile> roFiles = new ArrayList<IFile>();
- for(IFile f : files)
- {
- if(f.isReadOnly())
- {
- roFiles.add(f);
- }
- }
-
- if(roFiles.size() == 0)
- {
- return Status.OK_STATUS;
- }
-
- IWorkspace workspace = roFiles.get(0).getWorkspace();
- return workspace.validateEdit(roFiles.toArray(new IFile[roFiles.size()]), context);
- }
-
- /**
- * Sets editablility of an array of files. This is a convenience method equivalent to invoking
- * <code>setFilesEditable(files, IWorkspace.VALIDATE_PROMPT)</code>
- *
- * @param files
- * The array of files to be set editable
- * @return the status of the operation
- * @throws IllegalArgumentException
- * when the array is empty or null
- * @see EditResourcesManager#setFilesEditable(IFile[], Object)
- */
- public IStatus setFilesEditable(IFile[] files)
- {
- return setFilesEditable(files, IWorkspace.VALIDATE_PROMPT);
- }
-
- /**
- * Sets the content of a file
- *
- * @param file
- * the file to be set
- * @param content
- * the content to be set
- * @param updateFlags
- * update flags.
- * @see IFile#setContents(java.io.InputStream, int, IProgressMonitor)
- * @param progressMonitor
- * a progress monitor, or <code>null</code> if progress reporting is not desired
- * @return status of the operation
- * @throws NullPointerException
- * when <code>file</code> or <code>content</code> is null
- */
- public IStatus setFileContents(IFile file, String content, int updateFlags, IProgressMonitor progressMonitor)
- {
- if (file == null)
- {
- throw new NullPointerException("file"); //$NON-NLS-1$
- }
-
- if (content == null)
- {
- throw new NullPointerException("content"); //$NON-NLS-1$
- }
-
- IStatus editStatus = setFileEditable(file);
- if (editStatus.getSeverity() != IStatus.OK)
- {
- // something went wrong with the validateEdit operation
- return editStatus;
- }
-
- try
- {
- file.setContents(new StringInputStreamAdapter(content), updateFlags, progressMonitor);
- return Status.OK_STATUS;
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- return StatusUtils.statusError(JaxWsUtilMessages.EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG, e);
- }
- }
-
- /**
- * Sets the content of a file. This method is equivalent of invoking
- * <code>setFileContens(IFile file, String content, (keepHistory ? IFile.KEEP_HISTORY : IResource.NONE) | (force ? IFile.FORCE : IResource.NONE), IProgressMonitor monitor)</code>
- *
- * @param file
- * the file to be set
- * @param content
- * the content to be set
- * @param force
- * a flag controlling how to deal with resources that are not in sync with the local file system
- * @param keepHistory
- * a flag indicating whether or not store the current contents in the local history
- * @param monitor
- * a progress monitor, or <code>null</code> if progress reporting is not desired
- * @return status of the operation
- * @throws NullPointerException
- * when <code>file</code> or <code>content</code> is null
- * @see EditResourcesManager#setFileContents(IFile, String, int, IProgressMonitor)
- */
- public IStatus setFileContents(IFile file, String content, boolean force, boolean keepHistory, IProgressMonitor monitor)
- {
- return setFileContents(file, content, ((keepHistory ? IFile.KEEP_HISTORY : IResource.NONE) | (force ? IFile.FORCE : IResource.NONE)), monitor);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java
deleted file mode 100755
index dddb3a1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-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.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Implementation for file utilities interface
- *
- * @author Danail Branekov
- *
- */
-public class FileUtils implements IFileUtils {
- private static IFileUtils utils = null;
- private static int index = 0;
-
- public FileUtils() {
- }
-
- /**
- * The factory method
- *
- * @return a FileUtils instance
- */
- public static IFileUtils getInstance() {
- if (utils == null) {
- utils = new FileUtils();
- }
-
- return utils;
- }
-
- public final List<IEditorPart> getEditorsByFileLocation(
- final String fileLocation) throws FileNotFoundException {
- List<ICompilationUnit> units = getCompilationUnits(fileLocation);
- Set<IEditorPart> editors = new HashSet<IEditorPart>();
- for (ICompilationUnit cu : units) {
- final IEditorDescriptor editorDescr = getEditorDescriptor(cu
- .getElementName());
- editors.addAll(getEditorsByCompilationUnit(editorDescr,
- getActiveWorkbenchPage(), cu));
-
- }
-
- return Arrays.asList(editors.toArray(new IEditorPart[editors.size()]));
- }
-
- public final List<ICompilationUnit> getCompilationUnits(
- final String fileLocation) throws FileNotFoundException {
- if (fileLocation == null) {
- throw new NullPointerException("fileLocation"); //$NON-NLS-1$
- }
-
- IFile[] filesFound = ResourcesPlugin.getWorkspace().getRoot()
- .findFilesForLocationURI(new File(fileLocation).toURI());
- if (filesFound == null || filesFound.length == 0) {
- throw new FileNotFoundException("File: " + fileLocation + " does not exist"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- List<ICompilationUnit> units = new ArrayList<ICompilationUnit>();
-
- for (IFile file : filesFound) {
- IJavaElement javaElement = JavaCore.create(file);
- if (!(javaElement instanceof ICompilationUnit)) {
- throw new IllegalStateException("File: " + fileLocation + " is not a compilation unit"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- units.add((ICompilationUnit) javaElement);
- }
-
- return units;
- }
-
- public IProject getProjectUnit(String fileLocation)
- throws FileNotFoundException {
-
- if (fileLocation == null)
- {
- throw new NullPointerException("fileLocation"); //$NON-NLS-1$
- }
-
- IFile file = getFileForLocation(new Path(fileLocation));
- if (file == null)
- {
- throw new FileNotFoundException("File: " + fileLocation + " does not exist"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return file.getProject();
- }
-
- public final boolean isFileDisplayedInDirtyEditor(final String fileLocation)
- throws FileNotFoundException {
- return isFileDisplayedInDirtyEditor(getEditorsByFileLocation(fileLocation));
- }
-
- public boolean isCompilationUnitDisplayedInDirtyEditor(
- final ICompilationUnit unit) {
- return isFileDisplayedInDirtyEditor(getEditorsByCompilationUnit(unit));
- }
-
- public final void saveEditor(String fileLocation)
- throws FileNotFoundException {
- saveEditor(fileLocation, new NullProgressMonitor());
- }
-
- public void saveEditor(final String fileLocation,
- final IProgressMonitor monitor) throws FileNotFoundException {
- List<IEditorPart> editors = getEditorsByFileLocation(fileLocation);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, monitor);
- }
-
- public void saveEditor(final ICompilationUnit cu,
- final IProgressMonitor monitor) {
- List<IEditorPart> editors = getEditorsByCompilationUnit(cu);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, monitor);
- }
-
- public void saveEditor(final ICompilationUnit cu) {
- List<IEditorPart> editors = getEditorsByCompilationUnit(cu);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, new NullProgressMonitor());
- }
-
- private void saveEditors(final List<IEditorPart> editors,
- final IProgressMonitor monitor) {
- for (IEditorPart e : editors) {
- if (e.isDirty()) {
- e.doSave(monitor);
- }
- }
- }
-
- public Collection<IEditorPart> getDirtyEditors() {
- final Set<IEditorInput> inputs = new HashSet<IEditorInput>();
- final Collection<IEditorPart> result = new ArrayList<IEditorPart>();
- final IWorkbench workbench = PlatformUI.getWorkbench();
- final IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- final IWorkbenchPage[] pages = windows[i].getPages();
- for (int x = 0; x < pages.length; x++) {
- final IEditorPart[] editors = pages[x].getDirtyEditors();
- for (int z = 0; z < editors.length; z++) {
- final IEditorPart ep = editors[z];
- final IEditorInput input = ep.getEditorInput();
- if (!inputs.contains(input)) {
- inputs.add(input);
- result.add(ep);
- }
- }
- }
- }
- return result;
- }
-
- private IEditorDescriptor getEditorDescriptor(String fileName) {
- IEditorRegistry editorRegistry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- return editorRegistry.getDefaultEditor(fileName);
- }
-
- /**
- * Converts a String to a URL, assuming 'file:' as a default scheme.
- *
- * @param base
- * @param path
- *
- * @return
- *
- * @throws NullPointerException,
- * if the String is neither a valid URL, nor a valid filename.
- *
- */
- public final URL fileOrURLToURL(final URL base, final String path)
- throws IOException {
- if (path == null) {
- throw new NullPointerException("path"); //$NON-NLS-1$
- }
-
- String localPath = path;
- URL localBase = base;
-
- if (localBase == null) {
- localBase = new URL("file:");//$NON-NLS-1$
- }
-
- localPath = localPath.replace('\\', '/');
- try {
- String protocol = localBase.getProtocol();
- if (!"http".equals(protocol) //$NON-NLS-1$
- && !"https".equals(protocol) //$NON-NLS-1$
- && (localPath.charAt(1) == ':'
- || localPath.charAt(0) == '/' || localPath
- .charAt(0) == '\\')) {
- localPath = (new File(localPath)).toURI().toURL().toExternalForm();
- }
- } catch (IndexOutOfBoundsException e) {
- // $JL-EXC$
- }
-
- if (localPath.startsWith("file:") && localPath.length() > 5 //$NON-NLS-1$
- && localPath.charAt(5) != '/') {
- localPath = "file:/".concat(localPath.substring(5)); //$NON-NLS-1$
- } else {
- if (localPath.startsWith("file://") //$NON-NLS-1$
- && !localPath.startsWith("file:////") //$NON-NLS-1$
- && !localPath.startsWith("file://localhost/")) { //$NON-NLS-1$
- localPath = "file:////".concat(localPath.substring("file://" //$NON-NLS-1$ //$NON-NLS-2$
- .length()));
- }
- }
- URL url = new URL(localBase, localPath);
- return url;
- }
-
- public File createTempDirectory() {
- String tempDir = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
- index++;
- File temp1 = new File(tempDir, Integer.toString(this.hashCode()) + "_" //$NON-NLS-1$
- + index);
- temp1.mkdir();
- return temp1;
- }
-
- public void deleteDirectory(final File directory) {
- if (directory == null) {
- return;
- }
- if (!directory.exists()) {
- return;
- }
- for (File f : directory.listFiles()) {
- f.delete();
- }
- directory.delete();
- }
-
- public IFile[] getFilesByExtension(IProject project, String extension)
- throws CoreException {
- ContractChecker.nullCheckParam(extension, "extension"); //$NON-NLS-1$
- ArrayList<IFile> foundFiles = new ArrayList<IFile>();
-
- getFilesByExtension(foundFiles, project.members(), extension);
-
- return foundFiles.toArray(new IFile[foundFiles.size()]);
- }
-
- private void getFilesByExtension(ArrayList<IFile> foundFiles,
- IResource[] currentResources, String extension)
- throws CoreException {
- for (int ii = 0; ii < currentResources.length; ii++) {
- if (currentResources[ii].getType() == IResource.FOLDER) {
- getFilesByExtension(foundFiles,
- ((IFolder) currentResources[ii]).members(), extension);
- } else if (currentResources[ii].getType() == IResource.FILE
- && extension
- .equals(currentResources[ii].getFileExtension())) {
- foundFiles.add((IFile) currentResources[ii]);
- }
- }
- }
-
- public IFile getFileForLocation(IPath location) {
- return ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(
- location);
- }
-
- private IWorkbenchPage getActiveWorkbenchPage() {
- if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() == null) {
- return null;
- }
-
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- }
-
- public List<IEditorPart> getEditorsByCompilationUnit(
- final ICompilationUnit cu) {
- ContractChecker.nullCheckParam(cu, "cu"); //$NON-NLS-1$
- final IEditorDescriptor editorDescr = getEditorDescriptor(cu
- .getElementName());
- final IWorkbenchPage wbPage = getActiveWorkbenchPage();
- if (wbPage == null) {
- return new ArrayList<IEditorPart>(0);
- }
-
- return getEditorsByCompilationUnit(editorDescr, wbPage, cu);
- }
-
- private List<IEditorPart> getEditorsByCompilationUnit(
- final IEditorDescriptor editorDescriptor,
- final IWorkbenchPage page, final ICompilationUnit cu) {
- List<IEditorPart> editorPartReturned = new ArrayList<IEditorPart>();
-
- if (editorDescriptor != null && page != null) {
- for (IEditorReference editorReferece : page.getEditorReferences()) {
- IEditorPart editorPart = editorReferece.getEditor(true);
- if (isEditorApplicableForCu(editorPart, cu)) {
- editorPartReturned.add(editorPart);
- }
- }
- }
-
- return editorPartReturned;
- }
-
- private boolean isEditorApplicableForCu(final IEditorPart editor,
- final ICompilationUnit cu) {
- if (editor == null) {
- return false;
- }
-
- if (!(editor.getEditorInput() instanceof IFileEditorInput)
- || !(cu.getResource() instanceof IFile)) {
- return false;
- }
-
- final IFile cuFile = (IFile) cu.getResource();
- final IFileEditorInput editorInput = (IFileEditorInput) editor
- .getEditorInput();
-
- return cuFile.equals(editorInput.getFile());
- }
-
- public final boolean isFileDisplayedInDirtyEditor(
- final List<IEditorPart> displayingEditors) {
- ContractChecker.nullCheckParam(displayingEditors, "displayingEditors"); //$NON-NLS-1$
- for (IEditorPart editor : displayingEditors) {
- if (editor.isDirty()) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Reads file content as text and returns {@link String}
- *
- * @param sourceFile
- * @return the content of file
- * @throws IOException
- */
- public String getFileContent(final File sourceFile) throws IOException {
- final FileReader fr = new FileReader(sourceFile);
- final StringBuilder builder = new StringBuilder();
-
- try {
- final char[] buff = new char[1024];
- for (int cnt = 0; (cnt = fr.read(buff)) > -1;) {
- builder.append(buff, 0, cnt);
- }
- } finally {
- fr.close();
- }
-
- return builder.toString();
- }
-
- public void setCompilationUnitContent(final ICompilationUnit unit,
- final String content, final boolean force,
- final IProgressMonitor monitor) throws JavaModelException {
- ContractChecker.nullCheckParam(unit, "unit"); //$NON-NLS-1$
- ContractChecker.nullCheckParam(content, "content"); //$NON-NLS-1$
-
- unit.becomeWorkingCopy(monitor);
- try {
- unit.getBuffer().setContents(content);
- unit.commitWorkingCopy(force, monitor);
- } finally {
- unit.discardWorkingCopy();
- }
- }
-
- public void setCompilationUnitContentAndSaveDirtyEditors(
- final ICompilationUnit unit, final String content,
- final boolean force, final IProgressMonitor monitor)
- throws JavaModelException {
- setCompilationUnitContent(unit, content, force, monitor);
- if (isCompilationUnitDisplayedInDirtyEditor(unit)) {
- saveEditor(unit);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java
deleted file mode 100755
index 0fdfa06..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Interface that defines common utilies for file manipulation
- *
- * @author Danail Branekov
- */
-public interface IFileUtils {
-
- /**
- * Retrieves the editors that are currently displaying the file specfied.
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation().toOSString()
- * @return Current opened editors of the file specified or an empty list if such are not opened
- * @throws FileNotFoundException
- * when the file does not exist
- */
- public abstract List<IEditorPart> getEditorsByFileLocation(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Determines whether the file specified is displayed within an editor which
- * has a dirty state.
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation().toOSString()
- * @return whether the file is dirty
- * @throws FileNotFoundException
- * when the location specified does not exist
- */
- public abstract boolean isFileDisplayedInDirtyEditor(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Saves the dirty state editor
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation()#toOSString()
- * @throws FileNotFoundException
- * when the location specified does not exis
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(String fileLocation)
- throws FileNotFoundException;
-
- /**
- * Saves the dirty state editor
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation()#toOSString()
- * @param monitor
- * Progress monitor
- * @throws FileNotFoundException
- * when the location specified does not exis
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(String fileLocation,
- IProgressMonitor monitor) throws FileNotFoundException;
-
- /**
- * Retrieves a list of dirty editors
- *
- * @return collection containing dirty editors
- */
- public abstract Collection<IEditorPart> getDirtyEditors();
-
- /**
- * Retrieve compilation units for the location specified
- *
- * @param fileLocation
- * The absolute path to the file, e.g.
- * <code>C:\\dir1\\dir2\\file.name</code>
- * @see IResource#getLocation()#toOSString()
- *
- * @throws FileNotFoundException
- * when the file specified cannot be found in the workspace
- * @throws IllegalStateException
- * when the file specified is not a compilation unit
- * @throws NullPointerException
- * when fileLocation is null
- * @return The compilation units; cannot be null
- */
- public abstract List<ICompilationUnit> getCompilationUnits(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Retrieve project unit for the location specified
- *
- * @param fileLocation
- * The absolute path to the file, e.g.
- * <code>C:\\dir1\\dir2\\file.name</code>
- * @see IResource#getLocation()#toOSString()
- *
- * @throws FileNotFoundException
- * when the file specified cannot be found in the workspace
- * @throws NullPointerException
- * when fileLocation is null
- * @return The compilation units; cannot be null
- */
- public abstract IProject getProjectUnit(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Converts a String to a URL, assuming 'file:' as a default scheme.
- *
- * @param base
- * @param path
- *
- * @return
- *
- * @throws NullPointerException,
- * if the String is neither a valid URL, nor a valid filename.
- *
- */
- public abstract URL fileOrURLToURL(final URL base, final String path)
- throws IOException;
-
- /**
- * Creates a new directory in the OS temp folder
- *
- * @return the directory
- */
- public File createTempDirectory();
-
- /**
- * Deletes the specified directory and all its content
- *
- * param directory
- */
- public void deleteDirectory(final File directory);
-
- /**
- * Gets all the files with the provided extension within a project.
- *
- * @param project -
- * to be searched
- * @param extension -
- * types of files of interest
- */
- public IFile[] getFilesByExtension(IProject project, String extension)
- throws CoreException;
-
- /**
- * Retrieves a list of editors that are currently displaying the compilation
- * unit specified.
- *
- * @param cu
- * the compilation unit; must not be null
- * @return Current editors list or an empty list in case there are not
- * editors displaying the file specified
- *
- * @throws NullPointerException
- * when the <code>cu</code> parameter is null
- */
- public abstract List<IEditorPart> getEditorsByCompilationUnit(
- final ICompilationUnit cu);
-
- /**
- * Determines whether the compilation unit specified is displayed within an
- * editor which has a dirty state.
- *
- * @param unit
- * The compilation unit
- *
- * @return whether the compilation unit is dirty
- */
- public abstract boolean isCompilationUnitDisplayedInDirtyEditor(
- final ICompilationUnit unit);
-
- /**
- * Saves all the dirty state editors that are currently displaying the
- * compilation unit specified
- *
- * @param cu
- * the compilation unit
- * @param monitor
- * Progress monitor
- * @throws FileNotFoundException
- * when the location specified does not exist
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(ICompilationUnit cu,
- IProgressMonitor monitor);
-
- /**
- * Saves all the dirty state editors that are currently displaying the
- * compilation unit specified
- *
- * @param cu
- * the compilation unit
- * @throws FileNotFoundException
- * when the location specified does not exist
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(ICompilationUnit cu);
-
- /**
- * Retrieve a file instance for the location specified. This method is a
- * convenience method equivalent to invoking
- * <code>ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(location)</code>
- *
- * @param location
- * the file location; must be absolute
- * @return the corresponding file in the workspace, or null if none
- * @see IWorkspaceRoot#getFileForLocation(IPath)
- */
- public IFile getFileForLocation(IPath location);
-
- /**
- * Reads file content as text and returns {@link String}
- *
- * @param sourceFile
- * @return the content of file
- * @throws IOException
- */
- public String getFileContent(final File sourceFile) throws IOException;
-
- /**
- * Sets the content of the compilation unit specified with the
- * <code>content</code> provided. There is no validation of the content
- *
- * @param cUnit
- * the compilation unit. Must not be null. If the compilation
- * unit does not exist, it will be created
- * @param content
- * the content to be set. Must not be null
- * @param force
- * a flag to handle the cases when the contents of the original
- * resource have changed since this working copy was created
- * @param monitor
- * the monitor to report progress to or null if no progress
- * monitoring is required
- *
- * @throws JavaModelException
- * when there is a problem with setting compilation unit content
- * @see ICompilationUnit#becomeWorkingCopy(IProgressMonitor)
- * @see ICompilationUnit#commitWorkingCopy(boolean, IProgressMonitor)
- * @see ICompilationUnit#discardWorkingCopy()
- */
- public void setCompilationUnitContent(ICompilationUnit cUnit,
- String content, boolean force, IProgressMonitor monitor)
- throws JavaModelException;
-
- /**
- * Sets the content of the compilation unit specified with the
- * <code>content</code> provided and saves the dirty editors if any which
- * display the compilation unit. There is no validation of the content
- *
- * @param cUnit
- * the compilation unit. Must not be null. If the compilation
- * unit does not exist, it will be created
- * @param content
- * the content to be set. Must not be null
- * @param force
- * a flag to handle the cases when the contents of the original
- * resource have changed since this working copy was created
- * @param monitor
- * the monitor to report progress to or null if no progress
- * monitoring is required
- *
- * @throws JavaModelException
- * when there is a problem with setting compilation unit content
- * @see ICompilationUnit#becomeWorkingCopy(IProgressMonitor)
- * @see ICompilationUnit#commitWorkingCopy(boolean, IProgressMonitor)
- * @see ICompilationUnit#discardWorkingCopy()
- * @see IFileUtils#setCompilationUnitContent(ICompilationUnit, String,
- * boolean, IProgressMonitor)
- * @see IFileUtils#isFileDisplayedInDirtyEditor(String)
- * @see IFileUtils#saveEditor(ICompilationUnit, IProgressMonitor)
- */
- public void setCompilationUnitContentAndSaveDirtyEditors(
- ICompilationUnit cUnit, String content, boolean force,
- IProgressMonitor monitor) throws JavaModelException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java
deleted file mode 100755
index 8f880a3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.utils.exception.MissingResourceException;
-import org.eclipse.jst.ws.jaxws.utils.facets.FacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.facets.IFacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-
-/**
- * Utility that provides useful project management services
- *
- * @author Joerg Dehmel
- * @author Danail Branekov
- */
-public final class ProjectManagementUtils
-{
- private static final ILogger logger = new Logger();
-
- /**
- * Provides the meta-inf folder of a EJB project.
- *
- * @param pProjectName
- * project name
- * @return the resource of the meta-inf folder
- * @throws IllegalArgumentException
- * when project name specified is <code>null</code>, empty string, the project does not exist or is not accessible, or the project
- * is not an ejb project
- * @throws MissingResourceException
- * either the project doesn't exist in the workspace or it doesn't contain a meta-inf folder
- * @throws RuntimeException
- * when error occured while accessing java model
- */
- public static IFolder findMetaInfFolder(final String pProjectName) throws MissingResourceException
- {
- final String metaInfName = "META-INF"; //$NON-NLS-1$
- final String ejbModuleName = "ejbModule"; //$NON-NLS-1$
-
- if (!isEjb3Project(pProjectName))
- {
- throw new IllegalArgumentException("Project " + pProjectName + " is not an EJB project"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- IProject project = getProjectByName(pProjectName);
- IJavaProject javaProject = getJavaProject(project);
- IPackageFragment ejbModulePkgFragment = null;
-
- try
- {
- for (IPackageFragmentRoot fragmentRoot : javaProject.getPackageFragmentRoots())
- {
- if (fragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE && fragmentRoot.getElementName().equals(ejbModuleName))
- {
- ejbModulePkgFragment = fragmentRoot.getPackageFragment(metaInfName);
- }
- }
-
- verifyMetaInfFolder(ejbModulePkgFragment, pProjectName);
- return (IFolder) ejbModulePkgFragment.getCorrespondingResource();
- } catch (JavaModelException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- private static void verifyMetaInfFolder(IPackageFragment fragment, String projectName) throws MissingResourceException
- {
- if (fragment == null)
- {
- final String msg = MessageFormat.format("project {0} does not have a META-INF folder", new Object[] { projectName }); //$NON-NLS-1$
- final String localizedMsg = MessageFormat.format(JaxWsUtilMessages.ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg, new Object[] { projectName });
- throw new MissingResourceException(msg, localizedMsg);
- }
-
- try
- {
- IResource resource = fragment.getCorrespondingResource();
- // should not happen!
- if (!(resource instanceof IFolder))
- {
- throw new RuntimeException("Resource " + resource.getName() + " is not a folder"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (JavaModelException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Check whether a project is an ejb 3 project
- *
- * @param projectName
- * the name of the project; cannot be <code>null</code> or empty string
- * @return true in case the project specified is a ejb 3 project; false otherwise
- * @throws IllegalArgumentException
- * when the project name specified is <code>null</code>, empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- * @throws RuntimeException
- * when an error occurred while accessing the project metadata
- */
- public static boolean isEjb3Project(final String projectName)
- {
- IProject project = getProjectByName(projectName);
-
- try
- {
- return facetUtils().hasFacetWithVersion(project, IFacetUtils.EJB_30_FACET_VERSION, IFacetUtils.EJB_30_FACET_ID, true);
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Check whether a project is an web 2.5 project
- *
- * @param projectName
- * the name of the project; cannot be <code>null</code> or empty string
- * @return true in case the project specified is a web 2.5 project; false otherwise
- * @throws IllegalArgumentException
- * when the project name specified is <code>null</code>, empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- * @throws RuntimeException
- * when an error occurred while accessing the project metadata
- */
- public static boolean isWeb25Project(final String projectName)
- {
- IProject project = getProjectByName(projectName);
-
- try
- {
- return facetUtils().hasFacetWithVersion(project, IFacetUtils.WEB_25_FACET_VERSION, IFacetUtils.WEB_25_FACET_ID, true);
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Retrieve the project instance by project name
- *
- * @param projectName
- * the project name
- * @return the project instance
- * @throws IllegalArgumentException
- * when the project name specified is null or empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- *
- */
- public static IProject getProjectByName(String projectName)
- {
- if (projectName == null || projectName.length() == 0)
- {
- throw new IllegalArgumentException("Illegal project name: " + projectName); //$NON-NLS-1$
- }
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (project == null || !project.isAccessible())
- {
- throw new IllegalStateException("Project is not accessible"); //$NON-NLS-1$
- }
-
- return project;
- }
-
- /**
- * Get the java project instance
- *
- * @param project
- * the project as eclipse resource
- * @return the java project instance
- * @throws IllegalArgumentException
- * when <code>project</code> null or the project is not accessible
- */
- public static IJavaProject getJavaProject(IProject project)
- {
- if (project == null || !project.isAccessible())
- {
- throw new IllegalArgumentException("Project is not accessible"); //$NON-NLS-1$
- }
- return JavaCore.create(project);
- }
-
- /**
- * Refresh the resource specified. Refresh depth used is zero
- * @param resource the resource to be refreshed
- * @throws CoreException
- * @see IResource#DEPTH_ZERO
- */
- public static void refreshResource(IResource resource) throws CoreException
- {
- if(resource == null)
- {
- throw new NullPointerException("resource"); //$NON-NLS-1$
- }
-
- resource.refreshLocal(IResource.DEPTH_ZERO, null);
- }
-
- /**
- * Refreshes the project the resource specified belongs to. Refresh depth used is infinite.
- * @param the resource which project is to be refreshed
- * @throws CoreException
- * @throws IllegalArgumentException when the resource specified is a workspace root
- * @see IResource#DEPTH_INFINITE
- */
- public static void refreshProjectByResource(IResource resource) throws CoreException
- {
- if(resource == null)
- {
- throw new NullPointerException("resource"); //$NON-NLS-1$
- }
-
- if(resource instanceof IWorkspaceRoot)
- {
- throw new IllegalArgumentException("Operation is not defined for workspace roots"); //$NON-NLS-1$
- }
-
- resource.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- private static IFacetUtils facetUtils()
- {
- return new FacetUtils();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java
deleted file mode 100755
index c0c9629..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-
-/**
- * Adapter class that uses a StringReader to organize an InputStream
- *
- * @author Danail Branekov
- *
- */
-public class StringInputStreamAdapter extends InputStream
-{
- private StringReader reader;
-
- /**
- * Constructor
- *
- * @param string
- * @throws NullPointerException
- * when <code>string</code> is null
- */
- public StringInputStreamAdapter(String string)
- {
- if (string == null)
- {
- throw new NullPointerException("string"); //$NON-NLS-1$
- }
-
- reader = new StringReader(string);
- }
-
- @Override
- public int read() throws IOException
- {
- return reader.read();
- }
-
-}
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/.project b/docs/org.eclipse.jst.ws.cxf.doc.user/.project
deleted file mode 100755
index 9c59a3c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.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.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF
deleted file mode 100755
index b826460..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.doc.user;singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.3.100,4.0.0)"
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/about.html b/docs/org.eclipse.jst.ws.cxf.doc.user/about.html
deleted file mode 100755
index 4d690f1..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 06, 2009</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
-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.jst.ws.cxf.doc.user/book.css b/docs/org.eclipse.jst.ws.cxf.doc.user/book.css
deleted file mode 100755
index d7e2b57..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/book.css
+++ /dev/null
@@ -1,22 +0,0 @@
-@import "../PRODUCT_PLUGIN/book.css";
-
-span.control {
- font-weight: bold;
-}
-
-span.name {
- font-style: italic;
-}
-
-span.code {
- font-family: monospace;
-}
-
-p.nav_footer {
- font-weight: bold;
-}
-
-p.nav_footer a {
- font-weight: bold;
- font-style: italic;
-}
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/build.properties b/docs/org.eclipse.jst.ws.cxf.doc.user/build.properties
deleted file mode 100755
index aca4ea6..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = META-INF/,\
- plugin.xml,\
- about.html,\
- book.css,\
- cheatsheets/,\
- gettingstarted/,\
- images/,\
- plugin.properties,\
- tasks/,\
- tocgettingstarted.xml,\
- toctasks.xml,\
- build.properties,\
- reference/,\
- legal.html,\
- tocreference.xml
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/bottomUp-cxf-composite.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/bottomUp-cxf-composite.xml
deleted file mode 100755
index babe139..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/bottomUp-cxf-composite.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<compositeCheatsheet name="Creating a Web service from a Java implementation bean using Apache CXF">
- <taskGroup kind="set" name="Creating a Web service from a Java implementation bean using Apache CXF" skip="false">
- <intro>
- This cheat sheet will guide you through the individual steps to setup the Apache CXF runtime, create an Apache Tomcat server, a Dynamic Web Project enabled for Apache CXF Web services development and create a JAX-WS Web service from a Java implementation bean, deploy it to Apache Tomcat and test it using the Web Services Explorer.
- <br/>
- <br/>
-To assist you along the way, wizards and commands will be available for you to launch automatically.
- </intro>
- <onCompletion>
- Congratulations! You just configured the Apache CXF runtime, created an Apache Tomcat server, a Dynamic Web Project enabled for Apache CXF Web services developemnt and a JAX-WS Web service from a Java implementation bean and then deployed that service to Apache Tomcat and tested it with the Web Services Explorer.
- </onCompletion>
- <task kind="cheatsheet" name="Install and configure the Apache CXF Runtime" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and configure the Apache CXF runtime in the workbench.
-<br/>
-<br/>
-If you have already installed and configured the Apache CXF runtime in the workbench you may skip this task by clicking the "Skip this task" button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and configured the Apache CXF runtime!
- </onCompletion>
- <param name="path" value="configure-cxf-runtime.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Install and create an Apache Tomcat server" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and create an Apache Tomcat server.
-<br/>
-<br/>
-If you have already installed and created an Apache Tomcat server you may skip this task by clicking the "Skip this task" button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and created an Apache Tomcat server!
- </onCompletion>
- <param name="path" value="create-tomcat-server.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Create a project for CXF Web services" skip="true">
- <intro>
- This cheat sheet will demonstrate how to create a Dynamic Web Project and enable it for Apache CXF Web services developemnt.
-<br/>
-<br/>
-If you already have a Dynamic Web Project enabled for Apache CXF Web services development you may skip this task by clicking the "Skip this task" button.
- </intro>
- <onCompletion>
- Congratulations! You just created a Dynamic Web Project and enabled it for Apache CXF Web services development!
- </onCompletion>
- <param name="path" value="create-cxf-project.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Create a Web service from a Java implementation bean using Apache CXF" skip="false">
- <intro>
- This cheat sheet will demonstrate how to create a JAX-WS Web service from a Java implementation bean using the Apache CXF runtime.
- </intro>
- <onCompletion>
- Congratulations! You just icreated a JAX-WS Web service from a Java bean using the Apache CXF runtime!
- </onCompletion>
- <param name="path" value="create-bottomUp-cxf.xml">
- </param>
- </task>
- </taskGroup>
-</compositeCheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/configure-cxf-runtime.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/configure-cxf-runtime.xml
deleted file mode 100755
index 330085a..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/configure-cxf-runtime.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Configure the Apache CXF Runtime">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to install and configure the Apache CXF runtime in the workbench.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html"
- skip="true"
- title="Download and install the Apache CXF runtime">
- <description>
- Download and install the Apache CXF runtime version 2.1.x or 2.2.x from the following site: http://cxf.apache.org/. Selecting the "Click to perform" button below will open a web browser at that location.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.browser.openBrowser(url=http://cxf.apache.org/)"/>
- </item>
- <item
- href="/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html"
- skip="true"
- title="Configure Apache CXF in the workbench"
- dialog="true">
- <description>
- Apache CXF must be configured in the workbench before using it to create JAX-WS Web services.
-<br/>
-<br/>
-Select <b>Window->Preferences</b> from the main menu, expand the <b>Web Services</b> outline tree node within the resulting dialog, and choose <b>CXF 2.x Preferences</b>. Select the "Click to perform" button to do this automatically.
-<br/>
-<br/>
-Browse to the location where you installed Apache CXF and then click <b>OK</b> in the Preferences dialog.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage)"/>
- </item>
- <item
- href="/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html"
- skip="true"
- title="Set Apache CXF as the default runtime"
- dialog="true">
- <description>
- To set Apache CXF as the default Web service runtime in the workbench select <b>Window->Preferences</b> from the main menu, expand the <b>Web Services</b> outline tree node within the resulting dialog, and choose <b>Server and Runtime</b>. Selecting the "Click to perform" button will open this preference page.
-<br/>
-<br/>
-In the <b>Web service runtime</b> drop down list select "Apache CXF 2.x" and click <b>OK</b>.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage)"/>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-bottomUp-cxf.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-bottomUp-cxf.xml
deleted file mode 100755
index 8aaca57..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-bottomUp-cxf.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Create a Web Service from a Java implementation bean using Apache CXF">
- <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to use the Web Services wizard to create a Web service from a Java implementation bean using the Apache CXF runtime and to deploy that service to an Apache Tomcat server and test it using the Web Services Explorer.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.jdt.doc.user/gettingStarted/qs-9.htm"
- title="Create or Import a Java implementation bean">
- <description>
- Create or import a Java bean that will be used as the Web service implementation into the source folder of a Dynamic Web Project that has been enabled for Apache CXF Web services development.
- </description>
- </item>
- <item
- dialog="true"
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html"
- title="Create a Web service from a Java implementation bean">
- <description>
- To create a Web service from a Java implementation bean perform the following steps:
- </description>
- <subitem
- label="Select "File -> New -> Other..." from the main menu, expand the "Web Services" category and select "Web Service". Click "OK" to launch the Web Services wizard or select the "Click to perform" button to do this automatically.">
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.creation.ui.wizard.serverwizard)"/>
- </subitem>
- <subitem
- label="Select "Bottom up Java bean Web Service" as the "Web service type".">
- </subitem>
- <subitem
- label="Browse to select the Service Implementation.">
- </subitem>
- <subitem
- label="Verify that "Apache CXF 2.x" is selected as the Web service runtime.">
- </subitem>
- <subitem
- label="Move the service slider to the "Test service" stage.">
- </subitem>
- <subitem
- label="Accept all other default values on this page and click "Next >".">
- </subitem>
- <subitem
- label="On the Service Endpoint Interface configuration page select the "Use a Service Endpoint Interface" check box followed by the "Create an SEI" button. Enter a name for the SEI, "Select All" the methods and click "Finish".">
- </subitem>
- </item>
- <item
- href="/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html"
- skip="true"
- title="Test the Web service with the Web Services Explorer">
- <description>
- The Web Services Wizard will launch the <b>Web Services Explorer</b> after successfully creating and deploying your Web service to Apache Tomcat.
-<br/>
-<br/>
-To test the Web service select an opertaion in the <b>Web Services Explorer</b>, fill in the required information and click <b>Go</b>.
-<br/>
-<br/>
-The result will be displayed in the <b>Status</b> pane.
- </description>
- </item>
- <onCompletion>
- Congratulations! You just created a JAX-WS Web service!
- </onCompletion>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-client-cxf.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-client-cxf.xml
deleted file mode 100755
index b968c16..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-client-cxf.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet
- title="Generate a JAX-WS Client from a WSDL document using Apache CXF">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will guide you through the individual steps to generate a JAX-WS client from a WSDL document using Apache CXF.
- </description>
- </intro>
- <item
- dialog="true"
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html"
- title="Generate a JAX-WS client from a WSDL document">
- <description>
- To generate a JAX-WS client from a WSDL document perform the following steps.
-
- </description>
- <subitem label="Select "File -> New -> Other..." from the main menu, expand the "Web Services" category and choose "Web Service Client". Click "OK". Select the "Click to perform" button below to do this automatically.">
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard)"/>
- </subitem>
- <subitem
- label="Enter the URI to the remote WSDL file that will be used to generate the client.">
- </subitem>
- <subitem
- label="Select "Java Proxy" as the "Client type".">
- </subitem>
- <subitem
- label="Verify that "Apache CXF 2.x" is selected as the "Web service runtime".">
- </subitem>
- <subitem
- label="Select the "Client project" link to choose the project in to which the JAX-WS client will be generated.">
- </subitem>
- <subitem
- label="Move the client slider position to "Develop Client" and click "Finish".">
- </subitem>
- </item>
- <item
- href="/org.eclipse.jdt.doc.user/gettingStarted/qs-12.htm"
- title="Run the JAX-WS client">
- <description>
- Before running the client check the operation parameters that CXF generated for you and edit if necessary.
-<br/>
-<br/>
-To <b>run</b> your client, right-click on the client in the Project Explorer and select <b>Run As > Java Application</b>. A new console view will open and display the responses of the operation invocations.
- </description>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-cxf-project.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-cxf-project.xml
deleted file mode 100755
index f2305f9..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-cxf-project.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Create a project for CXF Web services">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to create a Dynamic Web Project and enable it for CXF JAX-WS Web service development.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html"
- skip="true"
- title="Open the Java EE perspective">
- <description>
- When working with JAX-WS Web services, you should use the Java EE perspective. If you already have the Java EE perspective active, you may skip this step by clicking the <b>Click to Skip</b> button. If not, select <b>Window -> Open Perspective -> Other...</b> from the main menu and choose <b>Java EE</b> in the resulting <b>Open Perspective</b> dialog box.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)"/>
- </item>
- <item
- dialog="true"
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html"
- skip="true"
- title="Create a Dynamic Web Project">
- <description>
- Before creating a JAX-WS Web Service, we need a project to put it in. Perform the following steps to create an Dynamic Web Project.
-<br/>
-<br/>
-Select <b>File -> New -> Project...</b> from the main menu, expand the <b>Web</b> category within the resulting <b>New Project</b> dialog box and choose <b>Dynamic Web Project</b>.
-<br/>
-<br/>
-On the first page of the wizard enter a <b>Project name:</b>, select Apache Tomcat as the <b>Target runtime</b> and click <b>Finish</b>.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard)"/>
- </item>
- <item
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html"
- skip="true"
- title="Enable JAX-WS Web service developement">
- <description>
- Enable a Dynamic Web Project for Apache CXF Web services development by right-clicking on the project and selecting <b>Properties</b>.
-<br/>
-<br/>
-In the <b>Project Facets</b> page enable the <b>CXF 2.x Web Services</b> facet by selecting the check box and click <b>OK</b>.
- </description>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-tomcat-server.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-tomcat-server.xml
deleted file mode 100755
index d3f2dd1..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-tomcat-server.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Create an Apache Tomcat server">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to install and create an instance of the Apache Tomcat server in order to deploy and test your JAX-WS Web service.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html"
- skip="true"
- title="Download and install Apache Tomcat">
- <description>
- Download and install Apache Tomcat version 5.5.x or 6.0.x from the following site: http://tomcat.apache.org/. Selecting the "Click to perform" button below will open a web browser at that location.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.browser.openBrowser(url=http://tomcat.apache.org/)"/>
- </item>
- <item
- dialog="true"
- href="/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html"
- skip="false"
- title="Create an Apache Tomcat server">
- <description>
- Perform the following the steps to create a Tomcat server in the workbench.
- </description>
- <subitem
- label="Select "File -> New -> Other..." from the main menu, expand the "Server" category within the resulting "New Wizard" dialog box and choose "Server". Click "Next >"."
- skip="true">
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.wst.server.ui.new.server)"/>
- </subitem>
- <subitem
- label="Select the version of Tomcat that you have installed on the first page. Click "Next >"."
- skip="true">
- </subitem>
- <subitem
- label="Specify the Tomcat Installation directory and click "Finish"."
- skip="true">
- </subitem>
- <subitem
- label="Open the Servers view by selecting "Window -> Show View -> Other.." from the main menu, expand the "Server" category within the resulting "Show View" dialog box and choose "Servers". Click "OK"."
- skip="true">
- <command
- required="false"
- serialization="org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.wst.server.ui.ServersView)"/>
- </subitem>
- <subitem
- label="Start the Tomcat server by selecting the server in the Servers view and clicking the "Start the server" button in the Servers view toolbar.">
- </subitem>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-topDown-cxf.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-topDown-cxf.xml
deleted file mode 100755
index 595f82d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-topDown-cxf.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet
- title="Generate a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to use the Web Services wizard to generate a JAX-WS Service Endpoint Interface and a skeleton implementation bean from a WSDL document using the Apache CXF runtime.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
- title="Create or import a WSDL document">
- <description>
- Create or import a WSDL file into the Web Content folder of the Web project. The WSDL document must have a valid service element.
- </description>
- </item>
- <item
- dialog="true"
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html"
- title="Generate a JAX-WS SEI and a skeleton implementation bean from the WSDL document">
- <description>
- To generate a JAX-WS SEI and a skeleton implementation bean from a WSDL document perform the following steps:
- </description>
- <subitem
- label="Select "File -> New -> Other..." from the main menu, expand the "Web Services" category and select "Web Service". Click "OK" to launch the Web Services wizard or select the "Click to perform" button to do this automatically.">
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.creation.ui.wizard.serverwizard)"/>
- </subitem>
- <subitem
- label="Select "Top down Java bean Web Service" as the "Web service type".">
- </subitem>
- <subitem
- label="Browse to select the Service definition.">
- </subitem>
- <subitem
- label="Verify that "Apache CXF 2.x" is selected as the Web service runtime.">
- </subitem>
- <subitem
- label="Move the service slider to the "Develop service" stage.">
- </subitem>
- <subitem
- label="Accept all other default values on this page and click "Next >".">
- </subitem>
- <subitem
- label="On the Apache CXF WSDL to Java page accept the defaults and click "Next >".">
- </subitem>
- <subitem
- label="Select "Generate Implementation" on the WSDL to Java preference override page and click "Finish".">
- </subitem>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/generate-cxf-wsdl-client-composite.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/generate-cxf-wsdl-client-composite.xml
deleted file mode 100755
index a6abeb4..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/generate-cxf-wsdl-client-composite.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<compositeCheatsheet name="Generating a JAX-WS client from a WSDL document using Apache CXF">
- <taskGroup kind="set" name="Generating a JAX-WS client from a WSDL document using Apache CXF" skip="false">
- <intro>
- This cheat sheet will guide you through the individual steps to generate a JAX-WS client from a WSDL document using Apache CXF.
- <br/>
- <br/>
-The generated client will include a main() that when run will connect to the remote service and invoke every operation on that remote service.
- <br/>
- <br/>
-To assist you along the way, wizards and commands will be available for you to launch automatically.
- </intro>
- <onCompletion>
- Congratulations! You just just generated a JAX-WS client from a WSDL document!
- </onCompletion>
- <task kind="cheatsheet" name="Install and configure the Apache CXF Runtime" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and configure the Apache CXF runtime in the workbench.
-<br/>
-<br/>
-If you have already installed and configured the Apache CXF runtime in the workbench you may skip this task by clicking the "Skip this task" button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and configured the Apache CXF runtime!
- </onCompletion>
- <param name="path" value="configure-cxf-runtime.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Create a project for CXF Web services" skip="true">
- <intro>
- This cheat sheet will demonstrate how to create a Dynamic Web Project and enable it for Apache CXF Web services developemnt.
-<br/>
-<br/>
-If you already have a Dynamic Web Project enabled for Apache CXF Web services development you may skip this task by clicking the "Skip this task" button.
- </intro>
- <onCompletion>
- Congratulations! You just created a Dynamic Web Project and enabled it for Apache CXF Web services development!
- </onCompletion>
- <param name="path" value="create-cxf-project.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Generate a JAX-WS client from a WSDL document using Apache CXF" skip="false">
- <intro>
- <b>Introduction</b>
- </intro>
- <onCompletion>
- <b>Conclusion</b>
- </onCompletion>
- <param name="path" value="create-client-cxf.xml">
- </param>
- </task>
- </taskGroup>
-</compositeCheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/topdown-cxf-composite.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/topdown-cxf-composite.xml
deleted file mode 100755
index 3f4988d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/topdown-cxf-composite.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<compositeCheatsheet name="Generating a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF">
- <taskGroup kind="set" name="Generating a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF" skip="false">
- <intro>
- This cheat sheet will guide you through the individual steps to setup the Apache CXF runtime, create an Apache Tomcat server, a Dynamic Web Project enabled for Apache CXF Web services development and generate a a fully annotated JAX-WS Service Endpoint Interface and a skeleton implementation bean from a WSDL document.
- <br/>
- <br/>
-To assist you along the way, wizards and commands will be available for you to launch automatically.
- </intro>
- <onCompletion>
- Congratulations! You just configured the Apache CXF runtime, created an Apache Tomcat server, a Dynamic Web Project enabled for Apache CXF Web services developemnt and generated a JAX-WS Service Endpoint Interface and a skeleton implementation bean from a WSDL document.
- </onCompletion>
- <task kind="cheatsheet" name="Install and configure the Apache CXF Runtime" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and configure the Apache CXF runtime in the workbench.
-<br/>
-<br/>
-If you have already installed and configured the Apache CXF runtime in the workbench you may skip this task by clicking the "Skip this task" button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and configured the Apache CXF runtime!
- </onCompletion>
- <param name="path" value="configure-cxf-runtime.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Install and create an Apache Tomcat server" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and create an Apache Tomcat server.
-<br/>
-<br/>
-If you have already installed and created an Apache Tomcat server you may skip this task by clicking the "Skip this task" button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and created an Apache Tomcat server!
- </onCompletion>
- <param name="path" value="create-tomcat-server.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Create a project for CXF Web services" skip="true">
- <intro>
- This cheat sheet will demonstrate how to create a Dynamic Web Project and enable it for Apache CXF Web services developemnt.
-<br/>
-<br/>
-If you already have a Dynamic Web Project enabled for Apache CXF Web services development you may skip this task by clicking the "Skip this task" button.
- </intro>
- <onCompletion>
- Congratulations! You just created a Dynamic Web Project and enabled it for Apache CXF Web services development!
- </onCompletion>
- <param name="path" value="create-cxf-project.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Generate a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF" skip="false">
- <intro>
- This cheat sheet will demonstrate how to generate a Service Endpoint Interface and a skeleton implementation bean from a WSDL document.
- </intro>
- <onCompletion>
- Congratulations! You just generated a JAX-WS Service Endpoint Interface and a skeleton implementation bean from a WSDL document.
- </onCompletion>
- <param name="path" value="create-topDown-cxf.xml">
- </param>
- </task>
- </taskGroup>
-</compositeCheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/gettingstarted/quickstart.html b/docs/org.eclipse.jst.ws.cxf.doc.user/gettingstarted/quickstart.html
deleted file mode 100755
index 636354e..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/gettingstarted/quickstart.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Quick Start</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Apache CXF Quick Start</h2>
-<p>Try out the following cheat sheets to help you quickly start using JAX-WS Tools and the Apache CXF runtime to create Web service applications.</p>
-<br>
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=org.eclipse.jst.ws.jaxws.cxf.bottomup)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open bottomup cheat sheet"><strong>Creating a Web service from a Java implementation bean using Apache CXF</strong></a>
-<br>
-<br>
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=org.eclipse.jst.ws.jaxws.cxf.topdown)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open topdown cheat sheet"><strong>Generating a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF</strong></a>
-<br>
-<br>
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=org.eclipse.jst.ws.jaxws.cxf.topdown.client)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open client cheat sheet"><strong>Generating a JAX-WS client from a WSDL document using Apache CXF</strong></a>
-<br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelc.png b/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelc.png
deleted file mode 100755
index 161e3aa..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelc.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelr.png b/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelr.png
deleted file mode 100755
index 4726f8c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelr.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelt.png b/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelt.png
deleted file mode 100755
index 74bee2b..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelt.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/legal.html b/docs/org.eclipse.jst.ws.cxf.doc.user/legal.html
deleted file mode 100755
index f12fcfc..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/legal.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Legal</title>
- <link href="book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body>
-<h2>Legal</h2>
-<p>Copyright © 2009, Shane Clarke. All rights reserved.</p>
-<p>This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at:</p>
-<p><code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code></p>
-<p><a href="about.html">Terms and conditions regarding the use of this guide.</a></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.properties b/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.properties
deleted file mode 100755
index 6505813..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-pluginName=CXF Web services User Guide (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-cheatsheet.cxf.bottomup.composite=Creating a Web service from a Java bean using Apache CXF
-cheatsheet.cxf.topdown.composite=Generating an SEI and a skeleton implementation bean from a WSDL document using Apache CXF
-cheatsheet.cxf.topdown.client.composite=Generating a JAX-WS Web Service Client from a WSDL document using Apache CXF
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.xml
deleted file mode 100755
index 0f495f2..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension point="org.eclipse.help.toc">
- <toc file="tocgettingstarted.xml"/>
- <toc file="toctasks.xml"/>
- <toc file="tocreference.xml"/>
- </extension>
-
- <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <cheatsheet
- category="org.eclipse.jst.ws.jaxws"
- composite="true"
- contentFile="$nl$/cheatsheets/bottomUp-cxf-composite.xml"
- id="org.eclipse.jst.ws.jaxws.cxf.bottomup"
- name="%cheatsheet.cxf.bottomup.composite">
- </cheatsheet>
- <cheatsheet
- category="org.eclipse.jst.ws.jaxws"
- composite="true"
- contentFile="$nl$/cheatsheets/topdown-cxf-composite.xml"
- id="org.eclipse.jst.ws.jaxws.cxf.topdown"
- name="%cheatsheet.cxf.topdown.composite">
- </cheatsheet>
- <cheatsheet
- category="org.eclipse.jst.ws.jaxws"
- composite="true"
- contentFile="$nl$/cheatsheets/generate-cxf-wsdl-client-composite.xml"
- id="org.eclipse.jst.ws.jaxws.cxf.topdown.client"
- name="%cheatsheet.cxf.topdown.client.composite">
- </cheatsheet>
- </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html
deleted file mode 100755
index c09aea5..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>CXF Project Facet</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>CXF Project Facet</h2>
-<p>Facets can be thought of as units of functionality that can be added and removed from facet based projects in the workspace.</p>
-<p>For more information on facets see the <a href="PLUGINS_ROOT/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html">WTP Project Facets documentation</a>.</p>
-<p>JAX-WS Tools provides the CXF Facet that performs the following when installed on a Dynamic Web Project:</p>
-<ul>
- <li>Configures the project with the CXF Classpath Container.</li>
- <li>Configures the project with the CXF JAX-WS endpoint configuration option that is selected in the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html">Endpoint Config</a> preferences.</li>
- <li>Enables JAX-WS Annotation processing if the option is selected in the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html">JAX-WS</a> preferences.</li>
-</ul>
-<p>The CXF Facet has the following facet prerequisites:</p>
-<ul>
- <li>Dynamic Web Module version 2.5</li>
- <li>Java version 5.0 or greater</li>
-</ul>
-<p>The CXF Facet and it's prerequisites are grouped into a project configuration that can be selected when creating a Dynamic Web Project.</p>
-
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_cxf_project.html">Creating a project for CXF Web services</a><br>
-<a href="../tasks/install_cxf_facet.html">Install the CXF Project Facet</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html
deleted file mode 100755
index c4b93ae..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>JAX-WS Endpoint Configuration Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Endpoint Config Preferences</h2>
-<p>The <strong>Endpoint Config</strong> tab provides setting that control the type of endpoint configuration that web projects are configured with when the CXF Facet is installed.</p>
-<p><img src="./images/spring_config.png" alt="Spring Config tab" > </p>
-<p></p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <thead>
- <tr>
- <td>
- <p><span class="control">Option</span></p>
- </td>
-
- <td>
- <p><span class="control">Description</span></p>
- </td>
-
- <td>
- <p><span class="control">Default</span></p>
- </td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td valign="top">
- <p>Use CXF Servlet</p>
- </td>
-
- <td valign="top">
- <p>Creates a cxf-servlet.xml file in the Web Projects WEB-INF directory. This is the slower option of the two as it loads all possible CXF modules for an endpoint</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Use Spring Application Context</p>
- </td>
-
- <td valign="top">
- <p>Creates a beans.xml file in the Web Projects WEB-INF directory. This is the fastest option as it allows the specification of which CXF modules to load for an endpoint</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
- </tbody>
- </table>
-
-<p>During bottom-up and top-down web services development the endpoint configuration file in the web project is updated with a jaxws:endpoint element for the generated web service.</p>
-
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="../reference/cxf_facet.html">CXF Project Facet</a><br>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a><br>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java implementation bean using Apache CXF</a><br>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/apt_processing.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/apt_processing.png
deleted file mode 100755
index 612bec6..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/apt_processing.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf2x_preferences.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf2x_preferences.png
deleted file mode 100755
index 2ff37b8..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf2x_preferences.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab.png
deleted file mode 100755
index c4b6e72..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/java2ws_tab.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/java2ws_tab.png
deleted file mode 100755
index 289068a..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/java2ws_tab.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/jaxws_annotations.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/jaxws_annotations.png
deleted file mode 100755
index 421690c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/jaxws_annotations.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/server_runtime.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/server_runtime.png
deleted file mode 100755
index 4f030f0..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/server_runtime.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/spring_config.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/spring_config.png
deleted file mode 100755
index e566417..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/spring_config.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/wsdl2java.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/wsdl2java.png
deleted file mode 100755
index 702d64c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/wsdl2java.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/xjc.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/xjc.png
deleted file mode 100755
index fa77021..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/xjc.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/java2ws_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/java2ws_tab.html
deleted file mode 100755
index c9f32fe..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/java2ws_tab.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Java2WS Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Java2WS Preferences</h2>
-<p>The <strong>Java2WS</strong> tab provides settings that control the CXF java2ws tool (for CXF 2.1.x runtimes and above). When a CXF 2.0.x runtime is selected this page displays a subset of the available setting that provides control of the CXF java2wsdl tool.</p>
-<p><img src="./images/java2ws_tab.png" alt="Java2WS tab" > </p>
-<p></p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <thead>
- <tr>
- <td>
- <p><span class="control">Option</span></p>
- </td>
-
- <td>
- <p><span class="control">Description</span></p>
- </td>
-
- <td>
- <p><span class="control">Default</span></p>
- </td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td valign="top">
- <p>Default Frontend</p>
- </td>
-
- <td valign="top">
- <p>Specifies the front end to use. Currently only the jaxws front end is supported</p>
- </td>
-
- <td valign="top">
- <p>jaxws</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Default Databinding</p>
- </td>
-
- <td valign="top">
- <p>Specifies the data binding to use. Currently only the jaxb data binding is supported</p>
- </td>
-
- <td valign="top">
- <p>jaxb</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate Client</p>
- </td>
-
- <td valign="top">
- <p>Select to generate a client mainline using JAX-WS APIs</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate Server</p>
- </td>
-
- <td valign="top">
- <p>Select to generate a server mainline using JAX-WS APIs</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate Wrapper and Fault Beans</p>
- </td>
-
- <td valign="top">
- <p>Select to generate wrapper and fault beans</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate WSDL</p>
- </td>
-
- <td valign="top">
- <p>Select to generate a WSDL document</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Default SOAP Binding</p>
- </td>
-
- <td valign="top">
- <p>Specify the SOAP binding to include in the generated WSDL document. SOAP 1.1 and SOAP 1.2 supported</p>
- </td>
-
- <td valign="top">
- <p>SOAP 1.1</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate separate XSD for the types</p>
- </td>
-
- <td valign="top">
- <p>Select to output schemas to separate files when generating a WSDL document</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- </tbody>
- </table>
-<p>The options on this tab are presented in the web services wizard when creating a bottom-up web service with the Apache CXF runtime.</p>
-<p>The options there can be changed from their default values for the web service being created.</p>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java implementation bean using Apache CXF</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html
deleted file mode 100755
index 03f747a..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>JAX-WS Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>JAX-WS Preferences</h2>
-<p>The <strong>JAX-WS</strong> tab provides settings that control the automatic generation of JAX-WS annotations and the enablement of JAX-WS annotation validation processing.</p>
-<p><img src="./images/jaxws_annotations.png" alt="JAXWS Annotations" > </p>
-<p>Select the JAX-WS annotations that are added by default to the implementation bean or SEI before input to the CXF java2ws tool.</p>
-<p><img src="./images/apt_processing.png" alt="APT Processing"> </p>
-<p>Select this option to enable annotation validation processing in web projects when configured with the CXF Facet.</p>
-<p>The JDT APT processors report errors, warnings and information messages in the Java Editor and Problems View when JAX-WS rules are broken.</p>
-<p>Annotation processing can be enabled and disabled on any Java based project using the Annotation Processing properties page on the projects context menu.</p>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/configuring_jaxws_annotation_processing.html">Enable JAX-WS Annotation Processing</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html
deleted file mode 100755
index 7ced285..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Apache CXF 2.x Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body>
-<h2>Apache CXF 2.x Preferences</h2>
-<p>JAX-WS Tools provides a preference page for setting up and configuring the Apache CXF runtime.</p>
-<p>The CXF 2.x preferences can be accessed via
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the CXF 2.x preference page">
-<strong>Window > Preferences... > Web Services > CXF 2.x Preferences</strong></a> from the top level menu. </p>
-<p><img src="./images/cxf2x_preferences.png" alt="CXF 2.x Preferences" > </p>
-<p>The CXF Runtime tab is used to point to the install location of a CXF 2.x runtime.</p>
-<p><img src="./images/cxf_runtime_tab.png" alt="CXF 2.x Preferences" > </p>
-<p>The <strong>Export runtime libraries...</strong> option is enabled by default and controls whether the CXF library jar files are resolved into the WEB-INF/lib folder of the web module at deployment time.</p>
-<p>This option can be enabled or disabled on existing projects that are configured with the CXF Facet using the Java EE Module Dependencies properties page.</p>
-<p>For details on the other CXF 2.x preferences tabs, refer to the following documents:</p>
-<ul>
- <li><a href="java2ws_tab.html">Java2WS</a></li>
- <li><a href="wsdl2java_tab.html">WSDL2Java</a></li>
- <li><a href="jaxws_tab.html">JAX-WS</a></li>
- <li><a href="endpoint_config_tab.html">Endpoint Config</a></li>
-</ul>
-For information on setting Apache CXF as the default Web services runtime, refer to this document.
-<ul>
- <li><a href="server_runtime.html">Server and Runtime</a></li>
-</ul>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="../reference/cxf_facet.html">CXF Project Facet</a><br>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/manage_cxf_lib_export.html">Manage the exporting of CXF libraries at deployment time</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html
deleted file mode 100755
index 722c701..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Server and Runtime</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Server and Runtime</h2>
-Apache CXF can be set as the default Web services runtime selection in the Web services wizards using the Server and Runtime preference page.
-<p>The Server and Runtime preference page can be accessed via
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the CXF 2.x preference page">
-<strong>Window > Preferences... > Web Services > Server and Runtime</strong></a> from the top level menu. </p>
-<p><img src="./images/server_runtime.png" alt="Server and Runtime" > </p>
-<p>Select <b>Apache CXF 2.x</b> in the <b>Web service runtime</b> drop down list and click <b>OK</b>.
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/wsdl2java_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/wsdl2java_tab.html
deleted file mode 100755
index ce2b708..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/wsdl2java_tab.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>WSDL2Java Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>WSDL2Java Preferences</h2>
-<p>The <strong>WSDL2Java</strong> tab provides settings that can be used to customize the code generated by the CXF wsdl2java tool.
-<p><img src="./images/wsdl2java.png" alt="Java2WS tab" > </p>
-<p></p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <thead>
- <tr>
- <td>
- <p><span class="control">Option</span></p>
- </td>
-
- <td>
- <p><span class="control">Description</span></p>
- </td>
-
- <td>
- <p><span class="control">Default</span></p>
- </td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td valign="top">
- <p>Generate Server</p>
- </td>
-
- <td valign="top">
- <p>Select to generate starting point code for a server mainline</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate Implementation</p>
- </td>
-
- <td valign="top">
- <p>Select to generate starting point code for an implementation bean</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate default values for the generated artifacts</p>
- </td>
-
- <td valign="top">
- <p>Select to generate default values for a generated client and implementation</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Enable processing of implicit SOAP headers</p>
- </td>
-
- <td valign="top">
- <p>Select to enable the processing of of SOAP headers defined in the wsdl:binding</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Enable loading of the default namespace package name mapping</p>
- </td>
-
- <td valign="top">
- <p>Select to enable the loading of the default namepsace package name mapping</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Enable the use of the default excludes namespace mapping</p>
- </td>
-
- <td valign="top">
- <p>Select to enable the loading of the default excludes namespace mapping</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Enable Auto Name Resolution</p>
- </td>
-
- <td valign="top">
- <p>Select to automatically resolve naming conflicts without requiring the use of binding customizations</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Use the Apache CXF proprietary WS-Addressing type</p>
- </td>
-
- <td valign="top">
- <p>Select to generate the older CXF proprietary WS-Addressing types instead of the JAX-WS 2.1 compliant WS-Addressing types. Used for compatibility with CXF 2.0</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
- </tbody>
- </table>
-
-<p>The following options are passed to the XJC processor.</p>
-<p><img src="./images/xjc.png" alt="Java2WS tab" > </p>
-<p></p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <thead>
- <tr>
- <td>
- <p><span class="control">Option</span></p>
- </td>
-
- <td>
- <p><span class="control">Description</span></p>
- </td>
-
- <td>
- <p><span class="control">Default</span></p>
- </td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td valign="top">
- <p>-Xdv</p>
- </td>
-
- <td valign="top">
- <p>Select to initialize fields mapped from elements with their default values</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xts</p>
- </td>
-
- <td valign="top">
- <p>Select to activate plugin to add a toString() method to generated classes</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xts:style:multiline</p>
- </td>
-
- <td valign="top">
- <p>Select to have toString produce multi line output</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xts:style:simple</p>
- </td>
-
- <td valign="top">
- <p>Select to have toString produce single line terse output</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xlocator</p>
- </td>
-
- <td valign="top">
- <p>Select to enable source location support for generated code</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xsync-methods</p>
- </td>
-
- <td valign="top">
- <p>Select to generate accessor methods with the 'synchronized' keyword</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-mark-generated</p>
- </td>
-
- <td valign="top">
- <p>Select to add @Generated annotations to the generated code</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- </tbody>
- </table>
-
-<p>The options on this tab are presented in the web services wizard when creating a top-down web service with the Apache CXF runtime.</p>
-<p>The options there can be changed from their default values for the web service being created.</p>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/configuring_jaxws_annotation_processing.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/configuring_jaxws_annotation_processing.html
deleted file mode 100755
index 9de89f2..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/configuring_jaxws_annotation_processing.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Configuring JAX-WS Annotation Processing</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Enable JAX-WS Annotation Processing</h2>
-<p>If the <strong>Enable annotation validation processing</strong> setting on the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html">JAX-WS</a> tab in
-the Apache CXF 2.x preferences is selected, annotation processing will be enabled on projects on as part of the CXF Facet install.</p>
-
-<h3>Enabling Existing Projects</h3>
-To turn annotation processing on or off on an existing project right-click on the project and choose <b>Properties</b> from the context menu.
- On the <strong>Java Compiler > Annotation Processing</strong> properties page select or deselect the <strong>Enable Annotation Processing</strong> check box and then click <b>OK</b>.
-<p><img src="./images/annotation_processing.png" alt="Annotation Processing" > </p>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html">CXF Project Facet</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html
deleted file mode 100755
index 1fb3e15..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Create a Web Service from a Java implementation bean using Apache CXF</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body>
-<h2>Create a Web Service from a Java implementation bean using Apache CXF</h2>
-<h3>Prerequisites:</h3>
-<ol>
-<li>Install and configure the Apache CXF runtime environment. See the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html">Requirements and Installation</a> page for more details.</li>
-<li>Create a Dynamic Web Project and enable it for Apache CXF Web services development as described here: <a href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a>.</li>
-<li>Create or import a Java implementation bean into the source folder of the Dynamic Web Project.</li>
-</ol>
-To create a Web service from a Java bean using the Apache CXF runtime environment:
-<ol>
-<li>Select <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the Java EE perspective"><strong>Window > Open Perspective > Java EE</strong></a> from the top level menu to switch to the Java EE perspective.</li>
-<li>In the Project Explorer view select the Java implementation bean that you created or imported into the Dynamic Web Projects source folder.</li>
-<li>Open the Web Service wizard by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.creation.ui.wizard.serverwizard)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new web service wizard"><strong>File > New > Other... > Web Services > Web Service</strong></a> from the top level menu.</li>
-<li>Web Services page: select <b>Bottom up Java bean Web Service</b> as the Web service type and browse to select the Java implementation bean from which to create the Web service:<p><img src="./images/bottom_up_wizard.png" alt="Bottom Up Web Services Wizard" ></p>
-<ol type="a">
-<li>Move the service slider to the stage of Web services development that you wish to complete.</li>
-<ul>
-<li>Develop: Invokes the Apache CXF java2ws tool using the preference defaults and the information gathered in the wizard to create a service. The wizard also generates a JAX-WS endpoint configuration file.</li>
-<li>Assemble: If required by the target server this phase assembles and configures the project that hosts the Web service into an EAR.</li>
-<li>Deploy: Generates the deployment artifacts for the Web service.</li>
-<li>Install: Installs and configures the Web Module and EARs on the target server.</li>
-<li>Start: Starts the target server once the Web service has been installed on it.</li>
-<li>Test: Use the Web Service Explorer to test the generated Web service.</li>
-</ul>
-<li>Server: Select a server to deploy your Web service to.</li>
-<li>Web service runtime: Select Apache CXF 2.x</li>
-<li>Service project: Select the project in your workspace into which Apache CXF will generate the code.</li>
-<li>If you wish to generate a client for your Web service, select <b>Java Proxy</b> as the Client type:
-<ul>
-<li>Move the client slider to the <b>Develop client</b> stage.</li>
-<li>Client project: Select a different project into which to generate the client code. The wizard will create the project for you if it doesn't exist and configure it with the CXF Facet.</li>
-</ul></li>
-<li>Publish the Web service: Launch the Web Services Explorer to publish your Web service to a UDDI registry.</li>
-<li>Monitor the Web service: Monitor the Web service's SOAP traffic using the TCP/IP Monitor.</li>
-</ol></li>
-<li>Click <b>Next ></b> to move to the Service Endpoint Interface configuration page:
-<ol>
-<li>Use a Service Endpoint Interface: Select or create a Service Endpoint Interface (SEI) that defines the methods you wish to expose in the service. This is the recommended approach.
-<ul>
-<li>Select an SEI: Browse to select an existing SEI.</li>
-<li>Create an SEI: Create an Interface from the Implementation by providing a name and the methods to declare in the extracted interface.</li>
-</ul>
-Both options create or update the <i>@WebService.endpointInterface</i> element on the implementation bean.
-</ol>
-</li>
-<li>Click <b>Next ></b> to move to the JAX-WS annotations configuration page:
-<p>This page allows you add to JAX-WS annotations to the SEI or Implementation (if not using an explicit SEI).</p>
-<p>The JAX-WS annotations element values default to those outlined in the JAX-WS specifications.</p>
-<p>If the Implementation bean / SEI contains overloaded methods the JAX-WS annotations added on this page adjust to resolve those conflicts.</p></li>
-<li>Click <b>Next ></b> to move to the Apache CXF java2ws configuration page which allows you to override the default <a href="../reference/java2ws_tab.html">java2ws</a> preferences:
-</li>
- <li>Test Web Service page. This page will be displayed if the service slider on the first page was set to Test service.
- <p>Select the launch button to test the Web Service with the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html">Web Services Explorer</a>.</p>
- </li>
- <li>Apache CXF JAX-WS client configuration page: This page will be displayed if the client slider on the Web services page was set to <b>Develop client</b>.
- <p>Refer to the <a href="./create_client.html">Generate a JAX-WS Web Service Client</a> page for information on the options displayed on this page.</p>
- </li>
- <li>Web Service Publication Page: Select whether or not you want to publish this Web service to a UDDI registry. Click <b>Finish</b></li>
-</ol>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-<a href="../tasks/create_client.html">Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html
deleted file mode 100755
index e1f5607..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body>
-<h2>Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</h2>
-<h3>Prerequisites:</h3>
-<ol>
- <li>Install and configure the Apache CXF runtime environment. See the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html">Requirements and Installation</a> page for more details.</li>
- <li>Create a Dynamic Web Project and enable it for Apache CXF Web services development as described here: <a href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a>.</li>
-</ol>
-To generate a JAX-WS client from a WSDL document:
-<ol>
- <li>Select <a class="command-link"
- href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the Java EE perspective"><strong>Window > Open Perspective > Java EE</strong></a> from the top level menu to switch to the Java EE perspective.</li>
- <li>Open the Web Service Client by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new web service client wizard"><strong>File
- > New > Other... > Web Services > Web Service Client</strong></a> from the top level menu.</li>
- <li>Web Services page:
- <p><img src="./images/ws_client_wizard.png" alt="Web Services Client Wizard"></p>
- <ol type="a">
- <Li>Enter the URI to the remote WSDL file that will be used to generate the client.</Li>
- <li>Select <b>Java Proxy</b> as the Client type.</li>
- <li>Move the client slider to the <b>Develop client</b> stage.</li>
- <li>Web service runtime: Select Apache CXF 2.x</li>
- <li>Service project: Select the project in your workspace into which Apache CXF will generate the code.</li>
- </ol>
- </li>
- <li>Click <b>Next ></b> to move to the first Apache CXF wsdl2java Configuration page:
- <ol>
- <li>Output Directory: Specify the source folder in the service project into which the code is generated.</li>
- <li>Package Name: Type the Java package name to use for the generated code.</li>
- <li>Specify WSDL Namespace to Package Name Mappings: Optionally specify WSDL namespace mappings to Java package names.</li>
- <li>Service Name: Specify the name of the WSDL service from which to generate code. The default is to generate code for every service in the WSDL document.</li>
- <li>Binding Files: Specify one or more JAX-WS or JAXB binding files.</li>
- </ol>
- </li>
- <li>Click <b>Next ></b> to move to the second Apache CXF wsdl2java configuration page which allows you to override the <a href="../reference/wsdl2java_tab.html">wsdl2java</a> default preferences:
- </li>
- <li>Click <b>Finish</b> to generate the client.</li>
-</ol>
-<p>The generated client will include a main() that when run will connect to the remote service and invoke every operation on that remote service.</p>
-<p>Before running the client open the client in the Java Editor and edit the generated arguments used to invoke the operations on the service.</p>
-<p>To <b>run</b> the client right-click on the client in the Project Explorer and select <b>Run As > Java Application</b>.
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java implementation bean using Apache CXF</a><br>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html
deleted file mode 100755
index 9550c64..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Create a project for CXF Web services</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body>
-<h2>Create a project for CXF Web services</h2>
-<p>To create a Dynamic Web Project and enable it for Apache CXF Web services development perform the following steps:<br/>
-<ol>
-<li>
-Select <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new dynamic web project wizard"><strong>File > New > Project... > Web > Dynamic Web Project</strong></a> from the top level menu
-enter the following information:
-<ol type="a">
-<li>Project name: Enter a name of the project.</li>
-<li>Target Runtime: Select the server you wish to deploy your Web service to. If it's not listed
-click <b>New</b> and browse to the location where it is installed.</li>
-<li>Dynamic Web Module version: Select version 2.5</li>
-<li>Default Configuration: Select the default configuration for your server type.</li>
-<li>EAR Membership: If deploying to Apache Tomcat ensure that the <b>Add project to an EAR</b> check box is not selected.</li>
-<li>Click Finish</li>
-</ol>
-</li>
-<li><a href="../tasks/install_cxf_facet.html">Install the CXF Project Facet</a></li>
-<li><a href="../tasks/manage_cxf_lib_export.html">Manage the exporting of CXF libraries at deployment time</a></li>
-</ol>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html">CXF Project Facet</a><br>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java bean using Apache CXF</a><br>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-<a href="../tasks/create_client.html">Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html
deleted file mode 100755
index 5f104e0..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body>
-<h2>Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</h2>
-<h3>Prerequisites:</h3>
-<ol>
- <li>Install and configure the Apache CXF runtime environment. See the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html">Requirements and Installation</a> page for more details.</li>
- <li>Create a Dynamic Web Project and enable it for Apache CXF Web services development as described here: <a href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a>.</li>
- <li>Create or import a WSDL document into the Web Content folder of the Dynamic Web Project.</li>
-</ol>
-<br/>
-To create an SEI and a skeleton implementation bean from a WSDL document using the Apache CXF runtime environment:
-<ol>
- <li>Select <a class="command-link"
- href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the Java EE perspective"><strong>Window > Open Perspective > Java EE</strong></a> from the top level menu to switch to the Java EE perspective.</li>
- <li>In the Project Explorer view select the WSDL document that you created or imported into the Dynamic Web Projects Web Content folder.</li>
- <li>Open the Web Service wizard by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.creation.ui.wizard.serverwizard)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new web service wizard"><strong>File > New > Other... > Web Services > Web Service</strong></a> from the top level menu.</li>
- <li>Web Services page: select <b>Top down Java bean Web Service</b> as the Web service type and browse to select the WSDL document from which to generate the SEI and implementation bean:
- <p><img src="./images/top_down_wizard.png" alt="Top down Web Services Wizard"></p>
- <ol type="a">
- <li>Move the service slider to the stage of Web services development that you wish to complete.</li>
- <ul>
- <li>Develop: Invokes the Apache CXF wsdl2java tool using the preference defaults and the information gathered in the wizard to generate an annotated Service Endpoint Interface and supporting classes. The wizard also generates a JAX-WS endpoint configuration file.</li>
- <li>Assemble: If required by the target server this phase
- assembles and configures the project that hosts the Web service into an EAR.</li>
- <li>Deploy: Generates the deployment artifacts for the Web service.</li>
- <li>Install: Installs and configures the Web Module and EARs on the target server.</li>
- <li>Start: Starts the target server once the Web service has been installed on it.</li>
- <li>Test: Use the Web Service Explorer to test the generated Web service.</li>
- </ul>
- <li>Server: Select a server to deploy your Web service to.</li>
- <li>Web service runtime: Select Apache CXF 2.x</li>
- <li>Service project: Select the project in your workspace into which Apache CXF will generate the code.</li>
- <li>If you wish to generate a client for your Web service, select <b>Java Proxy</b> as the Client type:
- <ul>
- <li>Move the client slider to the <b>Develop client</b> stage.</li>
- <li>Client project: Select a different project into which to generate the client code. The wizard will create the project for you if it doesn't exist and configure it with the CXF Facet.</li>
- </ul>
- </li>
- <li>Publish the Web service: Launch the Web Services Explorer to publish your Web service to a UDDI registry.</li>
- <li>Monitor the Web service: Monitor the Web service's SOAP traffic using the TCP/IP Monitor.</li>
- </ol>
- </li>
- <li>Click <b>Next ></b> to move to the first Apache CXF wsdl2java Configuration page:
- <ol>
- <li>Output Directory: Specify the source folder in the service project into which the code is generated.</li>
- <li>Package Name: Type the Java package name to use for the generated code.</li>
- <li>Specify WSDL Namespace to Package Name Mappings: Optionally specify WSDL namespace mappings to Java package names.</li>
- <li>Service Name: Specify the name of the WSDL service from which to generate code. The default is to generate code for every service in the WSDL document.</li>
- <li>Binding Files: Specify one or more JAX-WS or JAXB binding files.</li>
- </ol>
- </li>
- <li>Click <b>Next ></b> to move to the second Apache CXF wsdl2java configuration page which allows you to override the <a href="../reference/wsdl2java_tab.html">wsdl2java</a> default preferences:
- <p>Ensure that the <b>Generate Implementation</b> check box is selected and click <b>Next ></b>
- </li>
- <li>Test Web Service page. This page will be displayed if the service slider on the first page was set to Test service.
- <p>Select the launch button to test the Web Service with the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html">Web Services Explorer</a>.</p>
- </li>
- <li>Apache CXF JAX-WS client configuration page: This page will be displayed if the client slider on the Web services page was set to <b>Develop client</b>.
- <p>Refer to the <a href="./create_client.html">Create a JAX-WS Web Service Client</a> page for information on the options displayed on this page.</p>
- </li>
- <li>Web Service Publication Page: Select whether or not you want to publish this Web service to a UDDI registry. Click <b>Finish</b></li>
-</ol>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java implementation bean using Apache CXF</a><br>
-<a href="../tasks/create_client.html">Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/annotation_processing.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/annotation_processing.png
deleted file mode 100755
index 4b954d7..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/annotation_processing.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/bottom_up_wizard.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/bottom_up_wizard.png
deleted file mode 100755
index 27dc3b4..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/bottom_up_wizard.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/facet_configuration.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/facet_configuration.png
deleted file mode 100755
index d37c91a..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/facet_configuration.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/module_dependencies.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/module_dependencies.png
deleted file mode 100755
index 524ad9c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/module_dependencies.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/project_facets.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/project_facets.png
deleted file mode 100755
index 0917995..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/project_facets.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/top_down_wizard.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/top_down_wizard.png
deleted file mode 100755
index 8a7191c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/top_down_wizard.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/ws_client_wizard.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/ws_client_wizard.png
deleted file mode 100755
index 66cc22c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/ws_client_wizard.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html
deleted file mode 100755
index 5b28e92..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Install the CXF Project Facet</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Install the CXF Project Facet</h2>
-<p>There are three ways to enable a Dynamic Web Project for CXF Web services development.<p>
-<ol>
-<li>Let the Web Services wizards do it for you automatically when creating a Web service with Apache CXF.</li>
-<li>Select a CXF project configuration or modify another configuration when creating a new Dynamic Web Project
-<p><img src="./images/facet_configuration.png" alt="Project Configuration" > </p></li>
-<li>Right-click on a Dynamic Web Project and choose <b>Properties</b> from the context menu.<br/> On the the <b>Project Facets</b>
- properties page select the <b>CXF 2.x Web Services</b> facet in the list and click <b>OK</b>.
- <p><img src="./images/project_facets.png" alt="Project Facets" > </p></li>
-</ol>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html">CXF Project Facet</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/manage_cxf_lib_export.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/manage_cxf_lib_export.html
deleted file mode 100755
index c07d589..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/manage_cxf_lib_export.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Manage the exporting of CXF libraries at deployment time</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Manage the exporting of CXF libraries at deployment time</h2>
-<p>By default projects configured with the CXF facet are setup to resolve the CXF libraries to the WEB-INF/lib folder at deployment time.</p>
-<p>This however greatly increases the size of the deployed web module. If the web or application server you are deploying to is already configured with the Apache CXF libraries you
-can disable this option in the Apache CXF preferences.</p>
-<p>To enable or disable this functionality in a existing <b>Dynamic Web Project</b> already configured with the CXF Facet right-click on the project and choose <b>Properties</b>.<br/></p>
-<p><img src="./images/module_dependencies.png" alt="Module Dependencies"></p>
-Select the <b>Java EE Module Dependencies</b> properties page and select or deselect the version of the <b>Apache CXF Library</b> that is configured in the project and click <b>OK</b>.
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html">CXF Project Facet</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tocgettingstarted.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/tocgettingstarted.xml
deleted file mode 100755
index dc6b674..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tocgettingstarted.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Getting Started" link_to="toc.xml#gettingstarted">
- <topic label="Quick Start" href="gettingstarted/quickstart.html"/>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml
deleted file mode 100755
index 84fd4c4..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Reference" link_to="toc.xml#reference">
- <topic label="Preferences" href="reference/preferences.html">
- <topic label="Java2WS" href="reference/java2ws_tab.html"/>
- <topic label="WSDL2Java" href="reference/wsdl2java_tab.html"/>
- <topic label="JAX-WS" href="reference/jaxws_tab.html"/>
- <topic label="Endpoint Config" href="reference/endpoint_config_tab.html"/>
- <topic href="reference/server_runtime.html" label="Server and runtime">
- </topic>
- </topic>
- <topic href="reference/cxf_facet.html" label="CXF Project Facet">
- </topic>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/toctasks.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/toctasks.xml
deleted file mode 100755
index c5828f0..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/toctasks.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Tasks" link_to="toc.xml#tasks">
- <topic href="tasks/create_cxf_project.html" label="Create a project for CXF Web services">
- <topic href="tasks/install_cxf_facet.html" label="Install the CXF Project Facet">
- </topic>
- <topic href="tasks/manage_cxf_lib_export.html" label="Manage the exporting of CXF libraries during deployment">
- </topic>
- <topic href="tasks/configuring_jaxws_annotation_processing.html" label="Enable JAX-WS Annotation Processing">
- </topic>
- </topic>
- <topic label="Create a Web Service from a Java implementation bean using Apache CXF" href="tasks/create_bottomup.html"/>
- <topic label="Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF" href="tasks/create_topdown.html"/>
- <topic label="Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF" href="tasks/create_client.html"/>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/.project b/docs/org.eclipse.jst.ws.jaxws.doc.user/.project
deleted file mode 100755
index b800261..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.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.jst.ws.jaxws.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.jaxws.doc.user/META-INF/MANIFEST.MF
deleted file mode 100755
index 311f905..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.doc.user; singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.3.100,4.0.0)"
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/about.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/about.html
deleted file mode 100755
index 3b7e13d..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</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
-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.jst.ws.jaxws.doc.user/book.css b/docs/org.eclipse.jst.ws.jaxws.doc.user/book.css
deleted file mode 100755
index d7e2b57..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/book.css
+++ /dev/null
@@ -1,22 +0,0 @@
-@import "../PRODUCT_PLUGIN/book.css";
-
-span.control {
- font-weight: bold;
-}
-
-span.name {
- font-style: italic;
-}
-
-span.code {
- font-family: monospace;
-}
-
-p.nav_footer {
- font-weight: bold;
-}
-
-p.nav_footer a {
- font-weight: bold;
- font-style: italic;
-}
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/build.properties b/docs/org.eclipse.jst.ws.jaxws.doc.user/build.properties
deleted file mode 100755
index 3be9644..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = plugin.xml,\
- META-INF/,\
- *.xml,\
- plugin.properties,\
- about.html,\
- book.css,\
- concepts/,\
- gettingstarted/,\
- images/,\
- mainpage.html,\
- legal.html,\
- tips/,\
- reference/
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/concepts/jaxws.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/concepts/jaxws.html
deleted file mode 100755
index d299b70..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/concepts/jaxws.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Java API for XML-Based Web Services</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Java API for XML-Based Web Services</h2>
-<p>JAX-WS is a Java API for creating Web services and clients that communicate using XML. It was designed to supersede the JAX-RPC standard.</p>
-
-<p>Additional information:</p>
-<ul>
- <li><a href="http://www.jcp.org/en/jsr/detail?id=224">JSR-224 Specification</a></li>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/getting_started.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/getting_started.html
deleted file mode 100755
index 1082dd9..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/getting_started.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Getting Started</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Getting Started</h2>
-<p>This section provides information on getting starting started with JAX-WS Tools.</p>
-<ul>
- <li>
- <p><a href="requirements.html">Requirements and installation</a></p>
- </li>
- <li>
- <p><a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html">Configuring Apache CXF in the workbench</a></p>
- </li>
- <li>
- <p><a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/gettingstarted/quickstart.html">JAX-WS Tools Quick Start</a></p>
- </li>
-</ul>
-<p>For additional information, please visit the <a href="http://wiki.eclipse.org/JAXWS">JAX-WS Wiki</a> page.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html
deleted file mode 100755
index 8687b3d..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Requirements and installation</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Requirements and installation</h2>
-<p>JAX-WS Tools currently supports both Eclipse 3.4 and 3.5 environments and has the following <i>minimum</i> requirements.</p>
-<p></p>
-<ul>
- <li>
- <p>Eclipse 3.4.0 (<a href="http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads</a>)</p>
- </li>
- <li>
- <p>Eclipse Web Tools Platform (WTP) 3.0.1 (<a href="http://download.eclipse.org/webtools/downloads/">http://download.eclipse.org/webtools/downloads</a>)</p>
- </li>
-</ul>
-
-<h3>JDK Versions</h3>
-<p>Java 5.0 is the minimum required version and JDK 6.0 is supported from update 4 and later.</p>
-<p><a href="http://java.sun.com/javase/downloads/">http://java.sun.com/javase/downloads/</a></p>
-
-
-<h3>JAX-WS Runtime</h3>
-<p>Before creating Web service applications with JAX-WS Tools a JAX-WS runtime must be downloaded, installed and configured in the workbench.</p>
-<p>Currently we support the Apache CXF runtime for JAX-WS development from version 2.0.6 upwards. We recommend using a version from
-the CXF 2.1.x or the current 2.2.x stream.</p>
-<p>The Apache CXF runtime can be downloaded from the <a href="http://cxf.apache.org/download.html">Apache CXF Downloads</a> page.<p>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html">Apache CXF 2.x Preferences</a><br>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html">Create a project for CXF Web services</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/egg-incubation.png b/docs/org.eclipse.jst.ws.jaxws.doc.user/images/egg-incubation.png
deleted file mode 100755
index 861c981..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/egg-incubation.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelc.png b/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelc.png
deleted file mode 100755
index 161e3aa..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelc.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelr.png b/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelr.png
deleted file mode 100755
index 4726f8c..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelr.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelt.png b/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelt.png
deleted file mode 100755
index 74bee2b..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelt.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/wtplogosmall.jpg b/docs/org.eclipse.jst.ws.jaxws.doc.user/images/wtplogosmall.jpg
deleted file mode 100755
index 71bea77..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/images/wtplogosmall.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/legal.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/legal.html
deleted file mode 100755
index f12fcfc..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/legal.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Legal</title>
- <link href="book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body>
-<h2>Legal</h2>
-<p>Copyright © 2009, Shane Clarke. All rights reserved.</p>
-<p>This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at:</p>
-<p><code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code></p>
-<p><a href="about.html">Terms and conditions regarding the use of this guide.</a></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/mainpage.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/mainpage.html
deleted file mode 100755
index 10a98c1..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/mainpage.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>JAX-WS Tools User Guide</title>
- <link href="book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
- <div align="center">
- <br>
- <img alt="WebTools Platform" src="images/wtplogosmall.jpg" hspace="70">
- <img alt="WebTools Platform" src="images/egg-incubation.png" hspace="100">
- <br>
- <h1>JAX-WS Tools User Guide</h1>
- </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/plugin.properties b/docs/org.eclipse.jst.ws.jaxws.doc.user/plugin.properties
deleted file mode 100755
index d58cdb1..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-pluginName=JAX-WS Tools User Guide (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-cheatsheet.category.jaxws=JAX-WS Development
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/plugin.xml b/docs/org.eclipse.jst.ws.jaxws.doc.user/plugin.xml
deleted file mode 100755
index 114ce46..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/plugin.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension point="org.eclipse.help.toc">
- <toc file="toc.xml" primary="true"/>
- <toc file="tocconcepts.xml"/>
- <toc file="toctasks.xml"/>
- <toc file="tocreference.xml"/>
- </extension>
-
- <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <category
- id="org.eclipse.jst.ws.jaxws"
- name="%cheatsheet.category.jaxws">
- </category>
- </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/annotation_processors.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/annotation_processors.html
deleted file mode 100755
index 3022d18..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/annotation_processors.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta http-equiv="Content-Style-Type" content="text/css">
- <title>Annotation Processors</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Annotation Validation</h2>
-<p>JAX-WS Tools provides JDT-APT Annotation Processors that gather information about the source code as it is being edited.</p>
-<p>The processors report errors and warnings in the Problems View when JAX-WS rules are broken.</p>
-<p>JAX-WS Annotation processing is disabled by default.</p>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/tasks/configuring_jaxws_annotation_processing.html">Enable JAX-WS Annotation Processing</a><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/annotation_view.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/annotation_view.html
deleted file mode 100755
index fae3d98..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/annotation_view.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Annotations View</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body>
-<h2>Annotation Properties View</h2>
-<p>JAX-WS Tools provides a context aware Annotation properties view that reacts to the selection in the Java
-Editor presenting a list of applicable JAX-WS annotations for that selection.</p>
-<p>Selecting or deselecting a check box in the values column will add or remove the annotation at that row
-to the currently selected Java element in the Java Editor</p>
-<p><img src="./images/annotations_view.png" alt="Annotation properties view" > </p>
-<p>Expanding an annotation in the view will reveal the annotations elements and the element values.</p>
-<p>You can edit the annotation element values using the editors in the values column.</p>
-<p><img src="./images/annotations_view_expanded.png" alt="Annotation properties view expanded" > </p>
-<p>The <strong>Annotation Properties</strong> view is available under
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the annotation properties view"><strong>Window > Show View > Other... > JAX-WS > Annotation Properties</strong></a> from the top level menu. </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/images/annotations_view.png b/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/images/annotations_view.png
deleted file mode 100755
index 5c36b96..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/images/annotations_view.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/images/annotations_view_expanded.png b/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/images/annotations_view_expanded.png
deleted file mode 100755
index 894e53a..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/reference/images/annotations_view_expanded.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/images/content_assist.png b/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/images/content_assist.png
deleted file mode 100755
index 4047f27..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/images/content_assist.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/images/quick_fixes.png b/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/images/quick_fixes.png
deleted file mode 100755
index 2ca4c1b..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/images/quick_fixes.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/tips_tricks.html b/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/tips_tricks.html
deleted file mode 100755
index 92d7171..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/tips/tips_tricks.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Tips and tricks (JAX-WS Tools)</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body>
-<h2>Tips and tricks (JAX-WS Tools)</h2>
-<p>The following tips and tricks give some helpful ideas for increasing your productivity.</p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <tbody>
- <tr>
- <td valign="top">
- <p><b>Content Assist</b></p>
- </td>
-
- <td valign="top">
- <p>Content assist provides you with a list of proposals if available or will automatically insert the default value as outlined in the JAX-WS specifications for the annotations element.
- In the Java editor press <b>Ctrl+Space</b> or use <b>Edit > Content Assist > JAX-WS Proposals</b> when the cursor is between the quotation marks of an annotations element String value
- or directly after the '=' simple assignment operator.</p>
- <p><img src="./images/content_assist.png" alt="Content Assist" > </p>
-
- </td>
- </tr>
- <tr>
- <td valign="top">
- <p><b>Use Quick Fixes to resolve JAX-WS validation errors</b></p>
- </td>
-
- <td valign="top">
- <p>With <b>Annotation Processing</b> enabled on a project the JAX-WS annotation processors report errors and warning when
- rules are broken. A number of these rules are reported as fixable errors and warnings.</p>
- <p><img src="./images/quick_fixes.png" alt="Quick Fixes" > </p>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <p><b>Initialize the Web Services wizards</b></p>
- </td>
-
- <td valign="top">
- <p>Launch the Web Service and Web Service Client wizards from the context menu to initialize the wizard fields.
- Right-click on a Java Implementation bean and select <b>Web Services > Create Web Service</b>.
- For a WSDL document right-click and select <b>Web Services > Generate Java bean skeleton</b>.
- This will initialize the "Web service type", the "Service implementation" or "Service definition" fields
- and the "Service project" field.</p>
- </td>
- </tr>
- </tbody>
- </table>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/toc.xml b/docs/org.eclipse.jst.ws.jaxws.doc.user/toc.xml
deleted file mode 100755
index 66d75df..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/toc.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="JAX-WS Tools User Guide" topic="mainpage.html">
- <topic href="gettingstarted/getting_started.html" label="Getting Started">
- <topic href="gettingstarted/requirements.html" label="Requirements and Installation"/>
- <link toc="../org.eclipse.jst.ws.cxf.doc.user/tocgettingstarted.xml"/>
- <anchor id="gettingstarted"/>
- </topic>
- <topic label="Concepts">
- <anchor id="concepts"/>
- </topic>
- <topic label="Tasks">
- <anchor id="tasks"/>
- </topic>
- <topic label="Reference">
- <anchor id="reference"/>
- </topic>
- <topic href="tips/tips_tricks.html" label="Tips and tricks">
- </topic>
- <topic href="legal.html" label="Legal">
- </topic>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/tocconcepts.xml b/docs/org.eclipse.jst.ws.jaxws.doc.user/tocconcepts.xml
deleted file mode 100755
index 0865cc4..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/tocconcepts.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Concepts" link_to="toc.xml#concepts">
- <topic href="concepts/jaxws.html" label="Java API for XML-Based Web Services">
- </topic>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/tocreference.xml b/docs/org.eclipse.jst.ws.jaxws.doc.user/tocreference.xml
deleted file mode 100755
index fd0a1c9..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/tocreference.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Reference" link_to="toc.xml#reference">
- <link toc="../org.eclipse.jst.ws.cxf.doc.user/tocreference.xml"/>
- <topic href="reference/annotation_processors.html" label="Annotation Validation">
- </topic>
- <topic href="reference/annotation_view.html" label="Annotation Properties View">
- </topic>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/toctasks.xml b/docs/org.eclipse.jst.ws.jaxws.doc.user/toctasks.xml
deleted file mode 100755
index c0cdbc6..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/toctasks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Tasks" link_to="toc.xml#tasks">
- <link toc="../org.eclipse.jst.ws.cxf.doc.user/toctasks.xml"/>
-</toc>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/.project b/features/org.eclipse.jst.ws.cxf.feature/.project
deleted file mode 100644
index 7f8df9b..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.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.jst.ws.cxf.feature/build.properties b/features/org.eclipse.jst.ws.cxf.feature/build.properties
deleted file mode 100644
index 60e19e5..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html
diff --git a/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/epl-v10.html b/features/org.eclipse.jst.ws.cxf.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf.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.jst.ws.cxf.feature/feature.properties b/features/org.eclipse.jst.ws.cxf.feature/feature.properties
deleted file mode 100644
index 1ff79c9..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - 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=CXF Web Services (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=CXF Web Services
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\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\
- IONA Technologies PLC - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.cxf.feature/feature.xml b/features/org.eclipse.jst.ws.cxf.feature/feature.xml
deleted file mode 100644
index eb62c90..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/feature.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.cxf.feature"
- label="%featureName"
- version="0.4.2.qualifier"
- provider-name="%featureProvider"
- plugin="org.eclipse.jst.ws.cxf.core"
- 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>
-
- <includes
- id="org.eclipse.jst.ws.jaxws_userdoc.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.jdom"
- download-size="156"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.consumption.core"
- download-size="20"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.consumption.ui"
- download-size="44"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.core"
- download-size="204"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.creation.core"
- download-size="52"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.creation.ui"
- download-size="96"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.ui"
- download-size="120"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.wsdl"
- download-size="0"
- install-size="0"
- version="1.6.2.qualifier"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/license.html b/features/org.eclipse.jst.ws.cxf.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.cxf.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 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
-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/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index a864727..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,13 +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 feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=cxf32.gif
-
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.cxf.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.jst.ws.cxf.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index dd1352e..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - 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=CXF Web Services Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 1c4344d..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, cxf32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index b4a9d00..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-pluginName=CXF Web Services Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 60e19e5..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf.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>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index f2ac814..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - 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=CXF Web Services Developer Resources (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=Source code for CXF Web Services
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\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\
- IONA Technologies PLC - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.cxf.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.cxf.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 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
-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/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index a864727..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,13 +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 feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=cxf32.gif
-
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.cxf.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.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index dd1352e..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - 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=CXF Web Services Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 1c4344d..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, cxf32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 61a2e58..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/.project b/features/org.eclipse.jst.ws.cxf_sdk.feature/.project
deleted file mode 100644
index 31251ce..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf_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.jst.ws.cxf_sdk.feature/build.properties b/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
deleted file mode 100644
index 59f8b76..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html
-
-generate.feature@org.eclipse.jst.ws.cxf.feature.source=org.eclipse.jst.ws.cxf.feature
-
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/epl-v10.html b/features/org.eclipse.jst.ws.cxf_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf_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.jst.ws.cxf_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
deleted file mode 100644
index b06b79b..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - 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=CXF Web Services SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=CXF Web Services Source
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\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\
- IONA Technologies PLC - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.cxf_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
deleted file mode 100644
index 9466068..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.cxf_sdk.feature"
- label="%featureName"
- version="0.4.2.qualifier"
- provider-name="%featureProvider"
- 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>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html b/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.cxf_tests.feature/.project b/features/org.eclipse.jst.ws.cxf_tests.feature/.project
deleted file mode 100644
index 84fd72a..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf_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.jst.ws.cxf_tests.feature/build.properties b/features/org.eclipse.jst.ws.cxf_tests.feature/build.properties
deleted file mode 100644
index 60e19e5..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/epl-v10.html b/features/org.eclipse.jst.ws.cxf_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf_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.jst.ws.cxf_tests.feature/feature.properties b/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties
deleted file mode 100644
index f0bf7b1..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - 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=CXF Web Services Tests (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=CXF Web Services Tests
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\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\
- IONA Technologies PLC - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.cxf_tests.feature/feature.xml b/features/org.eclipse.jst.ws.cxf_tests.feature/feature.xml
deleted file mode 100644
index b774d61..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.cxf_tests.feature"
- label="%featureName"
- version="0.4.2.qualifier"
- provider-name="%featureProvider"
- 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="org.eclipse.jst.ws.cxf.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/license.html b/features/org.eclipse.jst.ws.cxf_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws.assembly.feature/.project b/features/org.eclipse.jst.ws.jaxws.assembly.feature/.project
deleted file mode 100644
index 6ad9c30..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.assembly.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.jst.ws.jaxws.assembly.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.assembly.feature/build.properties
deleted file mode 100644
index 8b13789..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml
deleted file mode 100644
index 9962276..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.assembly.feature"
- label="Assembly Feature"
- version="1.0.0.qualifier"
- provider-name="Webtools Platform Project">
-
- <description>
- This feature is for building only, to assemble the releated features, without forceing them to encoding dependencies on each other.
-This feature should never appear in build distributions or update sites.
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
-
- <includes
- id="org.eclipse.jst.ws.jaxws.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/.project b/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/.project
deleted file mode 100644
index 13a8962..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.assembly_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.jst.ws.jaxws.assembly_sdk.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/build.properties
deleted file mode 100644
index 8b13789..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml
deleted file mode 100644
index bea8a1f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.assembly_sdk.feature"
- label="Assembly Feature"
- version="1.0.0.qualifier"
- provider-name="Webtools Platform Project">
-
- <description>
- This feature is for building only, to assemble the releated features, without forceing them to encoding dependencies on each other.
-This feature should never appear in build distributions or update sites.
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.ws.jaxws_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom_sdk.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/.project b/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/.project
deleted file mode 100644
index 2f03db3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.assembly_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.jst.ws.jaxws.assembly_tests.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/build.properties
deleted file mode 100644
index 8b13789..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml
deleted file mode 100644
index 7317c54..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.assembly_tests.feature"
- label="Assembly Feature"
- version="1.0.0.qualifier"
- provider-name="Webtools Platform Project">
-
- <description>
- This feature is for building only, to assemble the releated features, without forceing them to encoding dependencies on each other.
-This feature should never appear in build distributions or update sites.
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.ws.jaxws_tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf_tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom_tests.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/.project b/features/org.eclipse.jst.ws.jaxws.dom.feature/.project
deleted file mode 100755
index 30fa25c..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.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.jst.ws.jaxws.dom.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/build.properties
deleted file mode 100755
index 399ea4b..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.dom.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.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.jst.ws.jaxws.dom.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties
deleted file mode 100644
index b42b308..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - 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=JAX-WS DOM Tools (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS DOM Tools
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools (WTP) Update Site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 SAP AG, Walldorf.\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\
- SAP AG - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws.dom.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.xml
deleted file mode 100755
index df75204..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.dom.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureProvider"
- 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>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.emf.edit.ui"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jst.ws.consumption.ui"/>
- <import plugin="org.eclipse.jst.ws.creation.ui"/>
- <import plugin="org.eclipse.wst.command.env"/>
- <import plugin="org.eclipse.wst.command.env.core"/>
- <import plugin="org.eclipse.wst.command.env.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.navigator"/>
- <import plugin="org.eclipse.wst.validation"/>
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.jst.j2ee.core" version="1.1.200" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jst.jee.ui" version="1.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jst.ws" version="1.0.304" match="greaterOrEqual"/>
- <import plugin="org.eclipse.wst.ws" version="1.1.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jem.util" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jdt.core" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.validation" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jface.text" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.edit"/>
- <import plugin="org.eclipse.jface" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.text" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.0" match="greaterOrEqual"/>
- <import plugin="org.apache.axis" version="1.4.0" match="greaterOrEqual"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.integration"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.utils"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/license.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</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
-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/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index 61fefeb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,12 +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 feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.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.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 932deac..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - 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=JAX-WS DOM Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright SAP AG, Walldorf. 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.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.jst.ws.jaxws.dom.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100755
index 92c1472..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-###############################################################################
-# Language File for this Plugin
-###############################################################################
-
-# Generic Label and Description
-Bundle-Name.0=JAX-WS DOM Tools Source (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/build.properties
deleted file mode 100755
index 399ea4b..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.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>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 04d35c3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - 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=JAX-WS DOM Tools Developer Resources (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=Source code for JAX-WS DOM Tools
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools (WTP) Update Site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 SAP AG, Walldorf.\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\
- SAP AG - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws.dom.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</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
-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/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 61fefeb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,12 +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 feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.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.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 932deac..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - 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=JAX-WS DOM Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright SAP AG, Walldorf. 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.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.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100755
index 92c1472..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-###############################################################################
-# Language File for this Plugin
-###############################################################################
-
-# Generic Label and Description
-Bundle-Name.0=JAX-WS DOM Tools Source (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/.project b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/.project
deleted file mode 100644
index 64d6e9f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom_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.jst.ws.jaxws.dom_sdk.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/build.properties
deleted file mode 100644
index e7a2a6a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
-
-generate.feature@org.eclipse.jst.ws.jaxws.dom.feature.source=org.eclipse.jst.ws.jaxws.dom.feature
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_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.jst.ws.jaxws.dom_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties
deleted file mode 100644
index 33b615e..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - 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=JAX-WS DOM Tools SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS DOM Tools Source
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools (WTP) Update Site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 SAP AG, Walldorf.\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\
- SAP AG - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws.dom_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
deleted file mode 100644
index 00ea6fd..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.dom_sdk.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureProvider"
- 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>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/license.html b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws.dom_tests.feature/.project b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/.project
deleted file mode 100644
index 03192a5..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom_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.jst.ws.jaxws.dom_tests.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_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.jst.ws.jaxws.dom_tests.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties
deleted file mode 100644
index c751c73..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - 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=JAX-WS DOM Tools Tests (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS DOM Tools Tests
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools (WTP) Update Site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 SAP AG, Walldorf.\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\
- SAP AG - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws.dom_tests.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml
deleted file mode 100644
index 1d14585..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.dom_tests.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureProvider"
- 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="org.eclipse.jst.ws.jaxws.dom.integration.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.runtime.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jmock"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.testutils"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.utils.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/license.html b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws.feature/.project b/features/org.eclipse.jst.ws.jaxws.feature/.project
deleted file mode 100644
index 2eb88eb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.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.jst.ws.jaxws.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.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.jst.ws.jaxws.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
deleted file mode 100644
index ffeced9..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Eclipse contributors and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - 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=JAX-WS Tools (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008, 2009 Eclipse contributors 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\
- Shane Clarke - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
deleted file mode 100644
index 616f916..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.feature"
- label="%featureName"
- version="0.5.2.qualifier"
- provider-name="%featureProvider"
- plugin="org.eclipse.jst.ws.jaxws.core"
- 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="org.eclipse.jst.ws.jaxws.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.xml.ws"
- download-size="0"
- install-size="0"
- version="2.1.0.qualifier"
- unpack="false"/>
-
- <plugin
- id="javax.jws"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.annotations.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.xml.bind"
- download-size="0"
- install-size="0"
- version="2.1.9.qualifier"
- unpack="false"/>
-
- <plugin
- id="javax.xml.stream"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxb.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/license.html b/features/org.eclipse.jst.ws.jaxws.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</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
-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/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index 61fefeb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,12 +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 feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.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.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index dfc6146..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - 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=JAX-WS Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.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.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 757f1cb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-pluginName=JAX-WS Tools Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.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>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index c43a8b3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Eclipse contributors and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - 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=JAX-WS Tools Developer Resources (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=Source code for JAX-WS Tools
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008, 2009 Eclipse contributors 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\
- Shane Clarke - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</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
-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/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 61fefeb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,12 +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 feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.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.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index dfc6146..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - 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=JAX-WS Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.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.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 798aebe..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for JAXWS Core
-pluginName=JAX-WS Tools Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project b/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project
deleted file mode 100644
index d823533..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws_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.jst.ws.jaxws_sdk.feature/build.properties b/features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties
deleted file mode 100644
index a4a2a8c..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
-
-generate.feature@org.eclipse.jst.ws.jaxws.feature.source=org.eclipse.jst.ws.jaxws.feature
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws_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.jst.ws.jaxws_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
deleted file mode 100644
index 90f2397..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Eclipse contributors and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - 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=JAX-WS Tools SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools Source
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008, 2009 Eclipse contributors 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\
- Shane Clarke - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
deleted file mode 100644
index 0f2b270..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws_sdk.feature"
- label="%featureName"
- version="0.5.2.qualifier"
- provider-name="%featureProvider"
- 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>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html b/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws_tests.feature/.project b/features/org.eclipse.jst.ws.jaxws_tests.feature/.project
deleted file mode 100644
index ae2165c..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws_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.jst.ws.jaxws_tests.feature/build.properties b/features/org.eclipse.jst.ws.jaxws_tests.feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.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.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws_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.jst.ws.jaxws_tests.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
deleted file mode 100644
index f1e2aef..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Eclipse contributors and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - 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=JAX-WS Tools Tests (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools Tests
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008, 2009 Eclipse contributors 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\
- Shane Clarke - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws_tests.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml
deleted file mode 100644
index 0dd9aa5..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws_tests.feature"
- label="%featureName"
- version="0.5.2.qualifier"
- provider-name="%featureProvider"
- 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="org.eclipse.jst.ws.jaxws.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxb.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html b/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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.jst.ws.jaxws_userdoc.feature/.project b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/.project
deleted file mode 100644
index 134f769..0000000
--- a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws_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.jst.ws.jaxws_userdoc.feature/build.properties b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/features/org.eclipse.jst.ws.jaxws_userdoc.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.jst.ws.jaxws_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws_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.jst.ws.jaxws_userdoc.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.properties
deleted file mode 100644
index cb04e9b..0000000
--- a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - 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=JAX-WS Tools User Documentation (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools User Documentation
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 Shane Clarke.\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\
- Shane Clarke - 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=epl-v10.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\
-March 17, 2005\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\
-\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.jst.ws.jaxws_userdoc.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.xml
deleted file mode 100644
index a0c26ef..0000000
--- a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws_userdoc.feature"
- label="%featureName"
- version="0.5.0.qualifier"
- provider-name="%featureProvider">
-
- <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="org.eclipse.jst.ws.jaxws.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/license.html b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/license.html
+++ /dev/null
@@ -1,79 +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>March 17, 2005</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>
-</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/tests/org.eclipse.jst.ws.cxf.tests/.classpath b/tests/org.eclipse.jst.ws.cxf.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore b/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.project b/tests/org.eclipse.jst.ws.cxf.tests/.project
deleted file mode 100644
index bf045b5..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.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.cxf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.cxf.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 8bd15d3..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.tests
-Bundle-Version: 0.4.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="3.8.0",
- org.eclipse.jst.ws.jaxws.core.tests;bundle-version="[0.5.0,0.6.0)",
- org.eclipse.jst.ws.jaxb.core.tests;bundle-version="[0.1.0,0.2.0)",
- org.eclipse.jst.ws.jaxws.dom.runtime.tests;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.ws.jaxws.dom.integration.tests;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.ws.jaxws.dom.ui.tests;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.ws.jaxws.utils.tests;bundle-version="[1.0.0,1.1.0)"
-Export-Package: org.eclipse.jst.ws.cxf.tests
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/about.html b/tests/org.eclipse.jst.ws.cxf.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.jst.ws.cxf.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.cxf.tests/build.properties b/tests/org.eclipse.jst.ws.cxf.tests/build.properties
deleted file mode 100644
index 74f90d9..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/build.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- test.xml,\
- about.html
-source.. = src/
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties b/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties
deleted file mode 100644
index 4904242..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-#Properties file for org.eclipse.jst.ws.cxf.tests
-Bundle-Name.0 = Tests Plug-in
-Bundle-Vendor.0 = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/AllTestsSuite.java b/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/AllTestsSuite.java
deleted file mode 100644
index bf548da..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,52 +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
- *******************************************************************************/
-package org.eclipse.jst.ws.cxf.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.jaxb.core.tests.JAXBCoreTestSuite;
-import org.eclipse.jst.ws.jaxws.core.annotation.validation.tests.JAXWSAnnotationValidationTestSuite;
-import org.eclipse.jst.ws.jaxws.core.tests.JAXWSCoreTestSuite;
-
-/**
- * This class specifies all the bundles of this component that provide a test
- * suite to run during automated testing.
- */
-public class AllTestsSuite extends TestSuite {
-
- public static Test suite() {
- return new AllTestsSuite();
- }
-
- public AllTestsSuite() {
- super("All JAXWS and JAXB Test Suites");
- addTest(JAXWSCoreTestSuite.suite());
- addTest(JAXWSAnnotationValidationTestSuite.suite());
- addTest(JAXBCoreTestSuite.suite());
-
- //Adding JAX-WS DOM Tools test suites
- addTest(org.eclipse.jst.ws.jaxws.dom.integration.tests.dom.AllTestsSuite.suite());
- addTest(org.eclipse.jst.ws.jaxws.dom.runtime.tests.AllTestsSuite.suite());
- addTest(org.eclipse.jst.ws.jaxws.dom.ui.tests.AllTestsSuite.suite());
- addTest(org.eclipse.jst.ws.jaxws.utils.tests.AllTestsSuite.suite());
- }
-
- /**
- * This is just need to run in a development environment workbench.
- */
- public void testAll() {
- // this method needs to exist, but doesn't really do anything
- // other than to signal to create an instance of this class.
- // The rest it automatic from the tests added in constructor.
-
- }
-}
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/EasyTest.java b/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/EasyTest.java
deleted file mode 100644
index 812e704..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/EasyTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.jst.ws.cxf.tests;
-
-import junit.framework.TestCase;
-
-public class EasyTest extends TestCase {
-
- /**
- * simple test just to always succeed to demonstrate tests are being called
- */
- public void testThatTestsRun() {
- assertTrue(true);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/test.xml b/tests/org.eclipse.jst.ws.cxf.tests/test.xml
deleted file mode 100644
index 58bafe4..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/test.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!--
- The following properties should be passed into this script
- so we'll fail fast if not.
- ${eclipse-home}
- ${buildDirectory}
- ${buildLabel}
- -->
-
- <fail
- message="Error: missing property. eclipse-home must be provided"
- unless="eclipse-home" />
- <fail
- message="Error: missing property. buildDirectory must be provided"
- unless="buildDirectory" />
- <fail
- message="Error: missing property. buildLabel must be provided"
- unless="buildLabel" />
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.jst.ws.cxf.tests"/>
- <property
- name="classname"
- value="org.eclipse.jst.ws.cxf.tests.AllTestsSuite"/>
- <property
- name="testType"
- value="ui-test"/>
-
- <!-- should be little need to change what's below -->
- <echo
- message="basedir: ${basedir}"/>
- <echo
- message="eclipse-home: ${eclipse-home}"/>
- <echo
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- message="plugin-name: ${plugin-name}"/>
- <echo
- message="classname: ${classname}"/>
- <echo
- message="testType ${testType}"/>
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}"/>
- <echo
- message="workspace: ${workspace}" />
- <!--
- This init 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="${plugin-name}.*xml"/>
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir
- dir="${workspace}"/>
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true"/>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target
- name="suite">
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}"/>
- <property
- name="plugin-name"
- value="${plugin-name}"/>
- <property
- name="classname"
- value="${classname}"/>
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt"/>
- </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">
- <!--
- usually no need to delete workspace until next run, and
- leaving it allows inspection
- -->
- <!-- <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="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml"/>
- <property
- name="output-file"
- value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/.classpath b/tests/org.eclipse.jst.ws.jaxb.core.tests/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/.project b/tests/org.eclipse.jst.ws.jaxb.core.tests/.project
deleted file mode 100644
index 9ee4adc..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxb.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.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9040021..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu May 07 15:40:23 IST 2009
-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.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxb.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index c6fb962..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxb.core.tests
-Bundle-Version: 0.1.1.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit;bundle-version="3.8.0",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)"
-Import-Package: javax.xml.bind;version="[2.1.0,2.2.0)",
- javax.xml.bind.annotation;version="[2.1.0,2.2.0)",
- javax.xml.bind.annotation.adapters;version="[2.1.0,2.2.0)",
- javax.xml.bind.attachment;version="[2.1.0,2.2.0)",
- javax.xml.bind.helpers;version="[2.1.0,2.2.0)",
- javax.xml.bind.util;version="[2.1.0,2.2.0)"
-Export-Package: org.eclipse.jst.ws.jaxb.core.tests
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/about.html b/tests/org.eclipse.jst.ws.jaxb.core.tests/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</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
-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.jaxb.core.tests/build.properties b/tests/org.eclipse.jst.ws.jaxb.core.tests/build.properties
deleted file mode 100644
index 9d3bc75..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- build.properties,\
- about.html
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxb.core.tests/plugin.properties
deleted file mode 100644
index 50a7ea5..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Progress Software
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-#properties file for JAXB Tools Tests
-pluginName=JAXB Tools Tests (Incubation)
-providerName=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AbstractAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AbstractAnnotationTest.java
deleted file mode 100644
index 3848156..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AbstractAnnotationTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.internal.resources.ResourceException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public abstract class AbstractAnnotationTest extends TestCase {
- protected TestJavaProject testJavaProject;
- protected ICompilationUnit source;
- protected CompilationUnit compilationUnit;
- protected AST ast;
- protected ASTRewrite rewriter;
- protected Annotation annotation;
- protected TextFileChange textFileChange;
-
- @Override
- protected void setUp() throws Exception {
- testJavaProject = new TestJavaProject("JavaProject");
- testJavaProject.setAutoBuilding(isAutoBuildingEnabled());
- testJavaProject.enableAnnotationProcessing(isAnnotationProcessingEnabled());
-
- source = testJavaProject.createCompilationUnit(getPackageName(), getClassName(), getClassContents());
-
- compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- ast = compilationUnit.getAST();
- rewriter = ASTRewrite.create(ast);
- annotation = getAnnotation();
- textFileChange = new TextFileChange("Add annotation", (IFile) source.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
- }
-
- protected boolean isAutoBuildingEnabled() {
- return false;
- }
-
- protected boolean isAnnotationProcessingEnabled() {
- return false;
- }
-
- protected abstract String getPackageName();
- protected abstract String getClassName();
- protected abstract String getClassContents();
- protected abstract Annotation getAnnotation();
-
- protected boolean executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return false;
- }
-
- change.initializeValidationData(monitor);
-
- PerformChangeOperation changeOperation = new PerformChangeOperation(change);
-
- try {
- changeOperation.run(monitor);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- return changeOperation.changeExecuted();
- }
-
- @Override
- protected void tearDown() throws Exception {
- deleteProject(testJavaProject.getProject());
-
- }
-
- private void deleteProject(IProject project) throws CoreException, InterruptedException {
- int noAttempts = 0;
- while (project != null && project.exists() && noAttempts < 5) {
- try {
- noAttempts++;
- if (project.isOpen()) {
- project.close(null);
- }
- project.delete(true, true, null);
- } catch (ResourceException re) {
- System.out.println(re.getLocalizedMessage());
- Thread.sleep(1);
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AddAnnotationToPackageTest.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AddAnnotationToPackageTest.java
deleted file mode 100644
index 016d91d..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AddAnnotationToPackageTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlSchema;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddAnnotationToPackageTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "package-info.java";
- }
-
- @Override
- public String getClassContents() {
- return "package com.example;\n";
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair locationVP = AnnotationsCore.createStringMemberValuePair(ast,
- "location", "uri:someSchema");
-
- MemberValuePair namespaceVP = AnnotationsCore.createStringMemberValuePair(ast,
- "namespace", "uri:testNS");
-
- memberValuePairs.add(locationVP);
- memberValuePairs.add(namespaceVP);
-
- return AnnotationsCore.createNormalAnnotation(ast, XmlSchema.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToPackage() {
- try {
- assertNotNull(annotation);
- assertEquals(XmlSchema.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
- IPackageDeclaration myPackage = source.getPackageDeclaration(getPackageName());
- assertNotNull(myPackage);
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(myPackage, annotation));
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(myPackage, XmlSchema.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(myPackage, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(XmlSchema.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/JAXBCoreTestSuite.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/JAXBCoreTestSuite.java
deleted file mode 100644
index b7ea011..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/JAXBCoreTestSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oisin Hurley - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JAXBCoreTestSuite extends TestSuite {
-
- public static Test suite() {
- return new JAXBCoreTestSuite();
- }
-
- public JAXBCoreTestSuite() {
- super("JAXB Core Tests");
- addTestSuite(AddAnnotationToPackageTest.class);
- addTestSuite(RemoveAnnotationFromPackageTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/RemoveAnnotationFromPackageTest.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/RemoveAnnotationFromPackageTest.java
deleted file mode 100644
index fdaad71..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/RemoveAnnotationFromPackageTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import javax.xml.bind.annotation.XmlSchema;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromPackageTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "package-info.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("@XmlSchema\n\n");
- classContents.append("package com.example;\n\n");
- classContents.append("import javax.xml.bind.annotation.XmlSchema;\n\n");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, XmlSchema.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromPackage() {
- try {
- assertNotNull(annotation);
- assertEquals(XmlSchema.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
- IPackageDeclaration myPackage = source.getPackageDeclaration(getPackageName());
- assertNotNull(myPackage);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(myPackage, AnnotationUtils
- .getAnnotationName(annotation)));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(myPackage, annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(myPackage, XmlSchema.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(myPackage, AnnotationUtils.getAnnotationName(annotation)));
- assertFalse(source.getImport(XmlSchema.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestJavaProject.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestJavaProject.java
deleted file mode 100644
index fdf4fc4..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestJavaProject.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-public class TestJavaProject extends TestProject {
- private IJavaProject javaProject;
-
- public TestJavaProject(String projectName) throws CoreException {
- super(projectName);
- javaProject = JavaCore.create(getProject());
- addProjectNature(getProject(), JavaCore.NATURE_ID);
-
- javaProject.setRawClasspath(new IClasspathEntry[0], null);
-
- createSourceFolder();
- addToClasspath(javaProject, getJREContainerEntry());
- createOutputFolder();
- }
-
- public void setAutoBuilding(boolean autoBuild) throws CoreException {
- IWorkspaceDescription description = ResourcesPlugin.getWorkspace().getDescription();
- description.setAutoBuilding(autoBuild);
- ResourcesPlugin.getWorkspace().setDescription(description);
- }
-
- public void enableAnnotationProcessing(boolean enable) {
- AptConfig.setEnabled(javaProject, enable);
- }
-
- private IClasspathEntry getJREContainerEntry() {
- IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
- if (defaultVMInstall != null && isJava6OrGreaterJRE(defaultVMInstall)) {
- return JavaRuntime.getDefaultJREContainerEntry();
- }
-
- IVMInstallType[] installTypes = JavaRuntime.getVMInstallTypes();
- for (IVMInstallType installType : installTypes) {
- IVMInstall[] vmInstalls = installType.getVMInstalls();
- for (IVMInstall vmInstall : vmInstalls) {
- if (isJava6OrGreaterJRE(vmInstall)) {
- return JavaCore.newContainerEntry(JavaRuntime.newJREContainerPath(installType.getId(),
- vmInstall.getName()));
- }
- }
- }
-
- return JavaRuntime.getDefaultJREContainerEntry();
- }
-
- private boolean isJava6OrGreaterJRE(IVMInstall vmInstall) {
- if (vmInstall instanceof IVMInstall2) {
- IVMInstall2 vmInstall2 = (IVMInstall2) vmInstall;
- if (vmInstall2.getJavaVersion().compareTo(JavaCore.VERSION_1_6) > 0) {
- return true;
- }
- }
- return false;
- }
-
- public ICompilationUnit createCompilationUnit(String packageName, String name, String contents) throws JavaModelException {
- return getPackageFragment(packageName).createCompilationUnit(name, contents, false, monitor);
- }
-
- private IPackageFragment getPackageFragment(String packageName) throws JavaModelException {
- return getPackageFragmentRoot().createPackageFragment(packageName, true, monitor);
- }
-
- private IPackageFragmentRoot getPackageFragmentRoot() {
- return getJavaProject().getPackageFragmentRoot(getProject().getFolder("src"));
- }
-
- private void createSourceFolder() throws CoreException {
- IFolder srcDir = getProject().getFolder("src");
- mkdirs(srcDir);
- addToClasspath(javaProject, JavaCore.newSourceEntry(srcDir.getFullPath()));
- }
-
- private void createOutputFolder() throws CoreException {
- IFolder outputDir = getProject().getFolder("bin");
- mkdirs(outputDir);
- getJavaProject().setOutputLocation(outputDir.getFullPath(), monitor);
- }
-
- public IJavaProject getJavaProject() {
- return javaProject;
- }
-
- public void addToClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
- try {
- IClasspathEntry[] currentClasspathEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newClasspathEntries = new IClasspathEntry[currentClasspathEntries.length + 1];
- System.arraycopy(currentClasspathEntries, 0, newClasspathEntries, 0,
- currentClasspathEntries.length);
- newClasspathEntries[currentClasspathEntries.length] = classpathEntry;
- javaProject.setRawClasspath(newClasspathEntries, new NullProgressMonitor());
- } catch (JavaModelException jme) {
- jme.printStackTrace();
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestProject.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestProject.java
deleted file mode 100644
index df3b152..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestProject.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class TestProject {
- IProgressMonitor monitor = new NullProgressMonitor();
-
- private IProject testProject;
-
- public TestProject(String projectName) throws CoreException {
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- testProject = workspaceRoot.getProject(projectName);
- testProject.create(monitor);
- testProject.open(monitor);
- }
-
- public IProject getProject() {
- return testProject;
- }
-
- public void addProjectNature(IProject project, String nature) {
- try {
- IProjectDescription projectDescription = project.getDescription();
- String[] previousNatures = projectDescription.getNatureIds();
- String[] newNatures = new String[previousNatures.length + 1];
- System.arraycopy(previousNatures, 0, newNatures, 0, previousNatures.length);
- newNatures[previousNatures.length] = nature;
- projectDescription.setNatureIds(newNatures);
- project.setDescription(projectDescription, null);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-
- public void mkdirs(final IFolder folder) {
- try {
- if (!folder.exists() && folder.getParent().isAccessible()) {
- folder.create(true, true, null);
- }
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/.project b/tests/org.eclipse.jst.ws.jaxws.core.tests/.project
deleted file mode 100644
index cb43fcb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.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.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9040021..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu May 07 15:40:23 IST 2009
-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.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 12383aa..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.core.tests
-Bundle-Version: 0.5.1.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit;bundle-version="3.8.0",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)"
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0"
-Export-Package: org.eclipse.jst.ws.jaxws.core.annotation.validation.tests,
- org.eclipse.jst.ws.jaxws.core.tests
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/about.html b/tests/org.eclipse.jst.ws.jaxws.core.tests/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</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
-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.jaxws.core.tests/build.properties b/tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties
deleted file mode 100644
index 9d3bc75..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- build.properties,\
- about.html
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties
deleted file mode 100644
index bd99711..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for JAX-WS Tools Tests
-pluginName=JAX-WS Tools Tests (Incubation)
-providerName=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java
deleted file mode 100644
index 5a5ad00..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jst.ws.jaxws.core.tests.AbstractAnnotationTest;
-
-public abstract class AbstractAnnotationValidationTest extends AbstractAnnotationTest {
-
- @Override
- protected boolean isAutoBuildingEnabled() {
- return true;
- }
-
- @Override
- protected boolean isAnnotationProcessingEnabled() {
- return true;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java
deleted file mode 100644
index eb4ff53..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-
-public abstract class AbstractDocumentBareValidationTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.BARE);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, javax.jws.soap.SOAPBinding.class.getSimpleName(),
- memberValuePairs);
-
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\t");
- classContents.append("public String oneIN(String inOne, String inTwo) {\n\t\treturn \"txt\";\n\t}");
- classContents.append("\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java
deleted file mode 100644
index 19de308..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.Oneway;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public abstract class AbstractOnewayValidationTest extends AbstractAnnotationValidationTest {
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, Oneway.class.getSimpleName(), null);
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- public abstract String getErrorMessage();
-
- public abstract IMethod getMethodToTest();
-
- public void testOnewayRule() {
- try {
- assertNotNull(annotation);
- assertEquals(Oneway.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = getMethodToTest();
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, Oneway.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(Oneway.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(getErrorMessage(), annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractSOAPBindingValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractSOAPBindingValidationTest.java
deleted file mode 100644
index 7c5e276..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractSOAPBindingValidationTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-public abstract class AbstractSOAPBindingValidationTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod(String in) {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java
deleted file mode 100644
index 51ae8c1..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public abstract class AbstractWebMethodPublicStaticFinalRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), null);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyClass\")\n");
- classContents.append("public class MyClass {\n\n");
- classContents.append("\tString myPackagePrivateMethod() {\n\t\treturn \"package-private\";\n\t}\n\n");
- classContents.append("\tprivate String myPrivateMethod() {\n\t\treturn \"private\";\n\t}\n\n");
- classContents.append("\tprotected String myProtectedMethod() {\n\t\tmyPrivateMethod();\n");
- classContents.append("\t\treturn \"protected\";\n\t}\n");
- classContents.append("\tpublic static String myStaticMethod() {\n\t\treturn \"static\";\n\t}\n\n");
- classContents.append("\tpublic final String myFinalMethod() {\n\t\treturn \"final\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public abstract IMethod getMethodToTeset();
- public abstract String getErrorMessage();
-
- public void testWebMethodRestriction() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = getMethodToTeset();
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(getErrorMessage(), annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java
deleted file mode 100644
index 85b6197..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public abstract class AbstractWebServicePublicAbstractFinalRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "MyClassPort");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "MyClassService");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServicePublicAbstractFinalRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java
deleted file mode 100644
index b2a0d8e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-public abstract class AbstractWebServiceSEIRule extends AbstractAnnotationValidationTest {
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- testJavaProject.createCompilationUnit(getPackageName(), getInterfaceName(), getInterfaceContents());
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(endpointInterface=\"com.example.MyInterface\", ");
- classContents.append("targetNamespace=\"http://example.com/\", portName=\"MyClassPort\", ");
- classContents.append("serviceName=\"MyClassService\")\n");
- classContents.append("public class MyClass {\n\n");
- classContents.append("\tpublic void methodOne(String in) {\n\t}\n\n");
- classContents.append("\tpublic String myMethod(String in) {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- private String getInterfaceContents() {
- StringBuilder seiContents = new StringBuilder("package com.example;\n\n");
- seiContents.append("import javax.jws.WebService;\n\n");
- seiContents.append("@WebService(name=\"MyInterface\", targetNamespace=\"http://example.com/\")\n");
- seiContents.append("public interface MyInterface {\n\n");
- seiContents.append("\tpublic String myMethod(String in);\n\n}");
- return seiContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- protected String getInterfaceName() {
- return "MyInterface.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java
deleted file mode 100644
index 5bf6422..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class DocBareNonVoidNoOutParametersRuleTest extends AbstractDocumentBareValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("public class MyClass {\n\n\t");
- classContents.append("public String noOut(String in, @WebParam(name=\"out\", mode=WebParam.Mode.OUT) ");
- classContents.append("String out) {\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- public void testNonVoidNoOUTParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("noOut", new String[] { "QString;",
- "QString; "});
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java
deleted file mode 100644
index 05b8458..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class DocBareOneNonHeaderINParameterRuleTest extends AbstractDocumentBareValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n\n");
- classContents.append("public class MyClass {\n\n\t");
- //classContents.append("public String oneIN() {\n\t\treturn \"txt\";\n\t}\n\n\t");
- classContents.append("public String oneMore(@WebParam(name=\"inOne\", mode=WebParam.Mode.IN) String ");
- classContents.append("inOne, @WebParam(name=\"inTwo\", mode=WebParam.Mode.IN)String inTwo) {\n\t\t");
- classContents.append("return \"txt\";\n\t}\n\n\tpublic String onlyOneIN(String inOne, String inTwo) {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
- return classContents.toString();
- }
-
- /*
- public void testOneNonHeaderINParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals("SOAPBinding", AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("oneIN", new String[0]);
- assertNotNull(method);
-
- AnnotationUtils.getImportChange(compilationUnit, javax.jws.soap.SOAPBinding.class,
- textFileChange, true);
-
- AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
- annotation, textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_ONE_NON_HEADER_IN_PARAMETER_ERROR_MESSAGE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }*/
-
- public void testOnlyOneNonHeaderINParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("onlyOneIN", new String[] { "QString;",
- "QString;" });
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
- public void testOnlyOneNonHeaderINParameterWithWebParamsRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("oneMore", new String[] { "QString;",
- "QString;" });
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java
deleted file mode 100644
index b565123..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class DocBareVoidOneINOneOutParameterRuleTest extends AbstractDocumentBareValidationTest {
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("import javax.xml.ws.Holder;\n\n");
- classContents.append("public class MyClass {\n\n\t");
- classContents.append("public void oneIn(@WebParam(name=\"inOne\", mode=WebParam.Mode.INOUT) ");
- classContents.append("Holder<String> inOne, @WebParam(name=\"inTwo\", mode=WebParam.Mode.IN) ");
- classContents.append("String inTwo) {\n\n\t}\n\n\t");
- classContents.append("public void oneOut(@WebParam(name=\"outOne\", mode=WebParam.Mode.INOUT) ");
- classContents.append("Holder<String> outOne, @WebParam(name=\"outTwo\", mode=WebParam.Mode.OUT) ");
- classContents.append("Holder<String> outTwo) {\n\n\t}\n\n}");
- return classContents.toString();
- }
-
- public void testVoidOneInParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("oneIn", new String[] { "QHolder<QString;>;",
- "QString;"});
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
- public void testVoidOneOutParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("oneOut", new String[] { "QHolder<QString;>;",
- "QHolder<QString;>;"});
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java
deleted file mode 100644
index 1f7d515..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class HolderTypeParameterRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), null);
- }
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("import javax.xml.ws.Holder;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic void myMethod(");
- classContents.append("@WebParam(mode=WebParam.Mode.IN) Holder<java.lang.String> param) {\n\n\t}\n}");
- return classContents.toString();
- }
-
- public void testHolderTypeParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.HOLDER_TYPE_MUST_BE_OUT_INOUT,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java
deleted file mode 100644
index 3684a1d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JAXWSAnnotationValidationTestSuite extends TestSuite {
-
- public static Test suite() {
- return new JAXWSAnnotationValidationTestSuite();
- }
-
- public JAXWSAnnotationValidationTestSuite() {
- super("JAX-WS Annotation Validation Tests");
- addTestSuite(DocBareNonVoidNoOutParametersRuleTest.class);
- addTestSuite(DocBareOneNonHeaderINParameterRuleTest.class);
- addTestSuite(DocBareVoidOneINOneOutParameterRuleTest.class);
- addTestSuite(OnewayNoReturnValueRuleTest.class);
- addTestSuite(OnewayNoCheckedExceptionsRuleTest.class);
- addTestSuite(HolderTypeParameterRuleTest.class);
- addTestSuite(OnewayNoHolderParametersRuleTest.class);
- addTestSuite(SOAPBindingRPCStyleOnMethodRuleTest.class);
- addTestSuite(SOAPBindingRPCEncodedRuleTest.class);
- addTestSuite(SOAPBindingDocumentEncodedRuleTest.class);
- addTestSuite(SOAPBindingRCPBareRuleTest.class);
- addTestSuite(SOAPBindingMixedBindingsRuleTest.class);
- addTestSuite(WebMethodCheckForWebServiceRuleTest.class);
- addTestSuite(WebMethodExcludeRuleOnSEITest.class);
- addTestSuite(WebMethodExcludeRuleOnImplTest.class);
- addTestSuite(WebMethodNoPackagePrivateMethodRuleTest.class);
- addTestSuite(WebMethodNoPrivateMethodRuleTest.class);
- addTestSuite(WebMethodNoProtectedMethodRuleTest.class);
- addTestSuite(WebMethodNoFinalModifierRuleTest.class);
- addTestSuite(WebMethodNoStaticModifierRuleTest.class);
- addTestSuite(WebParamModeHolderTypeRuleTest.class);
- addTestSuite(WebServiceDefaultPublicConstructorRuleTest.class);
- addTestSuite(WebServiceNoFinalizeMethodRuleTest.class);
- addTestSuite(WebServiceNoFinalModiferRuleTest.class);
- addTestSuite(WebServiceNoAbstractModifierRuleTest.class);
- addTestSuite(WebServiceSEINoServiceNameRuleTest.class);
- addTestSuite(WebServiceSEINoEndpointInterfaceRuleTest.class);
- addTestSuite(WebServiceSEINoPortNameRuleTest.class);
- addTestSuite(WebServiceSEINoWebMethodRuleTest.class);
- addTestSuite(WebServiceSEINoWebResultRuleTest.class);
- addTestSuite(WebServiceSEINoWebParamRuleTest.class);
- addTestSuite(WebServiceSEINoOnewayRuleTest.class);
- addTestSuite(WebServiceSEINoSOAPBindingRuleTest.class);
- addTestSuite(WebServiceWebServiceProviderCoExistRuleTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java
deleted file mode 100644
index 8f9d09a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class OnewayNoCheckedExceptionsRuleTest extends AbstractOnewayValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic void myMethod(int i) throws Exception {\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.ONEWAY_NO_CHECKED_EXCEPTIONS;
- }
-
- @Override
- public IMethod getMethodToTest() {
- return source.findPrimaryType().getMethod("myMethod", new String[]{"I"});
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java
deleted file mode 100644
index e5f4a8a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class OnewayNoHolderParametersRuleTest extends AbstractOnewayValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.xml.ws.Holder;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic void myMethod(");
- classContents.append("Holder<String> in) {\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.ONEWAY_NO_HOLDER_PARAMETERS;
- }
-
- @Override
- public IMethod getMethodToTest() {
- return source.findPrimaryType().getMethod("myMethod", new String[]{"QHolder<QString;>;"});
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java
deleted file mode 100644
index 71a0f91..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class OnewayNoReturnValueRuleTest extends AbstractOnewayValidationTest {
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic int myMethod(int i) {\n\t\treturn 0;\n\t}\n}");
- return classContents.toString();
- }
-
- public String getErrorMessage() {
- return JAXWSCoreMessages.ONEWAY_NO_RETURN_VALUE;
- }
-
- @Override
- public IMethod getMethodToTest() {
- return source.findPrimaryType().getMethod("myMethod", new String[]{"I"});
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingDocumentEncodedRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingDocumentEncodedRuleTest.java
deleted file mode 100644
index def8420..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingDocumentEncodedRuleTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingDocumentEncodedRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.ENCODED);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.BARE);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- public void testSOAPBindingDocumentEncodedRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_DOCUMENT_ENCODED_NOT_SUPPORTED,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMixedBindingsRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMixedBindingsRuleTest.java
deleted file mode 100644
index 58900ce..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMixedBindingsRuleTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingMixedBindingsRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.soap.SOAPBinding;\n\n");
- classContents.append("@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL, ");
- classContents.append("parameterStyle=SOAPBinding.ParameterStyle.WRAPPED)\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod(String in) {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- public void testSOAPBindingMixedBindingsRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_NO_MIXED_BINDINGS,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRCPBareRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRCPBareRuleTest.java
deleted file mode 100644
index 9862694..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRCPBareRuleTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingRCPBareRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.RPC);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.BARE);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- public void testSOAPBindingRPCBareRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_RPC_NO_BARE_PARAMETER_STYLE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCEncodedRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCEncodedRuleTest.java
deleted file mode 100644
index 01b0a27..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCEncodedRuleTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingRPCEncodedRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.RPC);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.ENCODED);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- public void testSOAPBindingRPCEncodedRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_RPC_ENCODED_NOT_SUPPORTED,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCStyleOnMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCStyleOnMethodRuleTest.java
deleted file mode 100644
index 49424a0..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCStyleOnMethodRuleTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingRPCStyleOnMethodRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.RPC);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- public void testSOAPBindingRPCStyleOnMethodsRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_NO_RPC_STYLE_ON_METHODS,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java
deleted file mode 100644
index 0440c4d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodCheckForWebServiceRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "operationName", "myMethod");
-
- MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast, "action",
- "urn:MyMethod");
-
- memberValuePairs.add(operationValuePair);
- memberValuePairs.add(actionValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod() {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebMethodCheckForWebServiceRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java
deleted file mode 100644
index 70e88ba..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodExcludeRuleOnImplTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "operationName", "myMethod");
-
- MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast, "action",
- "urn:MyMethod");
-
- MemberValuePair excludeValuePair = AnnotationsCore.createBooleanMemberValuePair(ast, "exclude",
- Boolean.TRUE);
-
- memberValuePairs.add(operationValuePair);
- memberValuePairs.add(actionValuePair);
- memberValuePairs.add(excludeValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyClass\")\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod() {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebMethodCheckForWebServiceRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java
deleted file mode 100644
index 1b80249..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodExcludeRuleOnSEITest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair excludeValuePair = AnnotationsCore.createBooleanMemberValuePair(ast, "exclude",
- Boolean.TRUE);
-
- memberValuePairs.add(excludeValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyInterface\")\n");
- classContents.append("public interface MyClass {\n\n\tpublic String myMethod();\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebMethodExcludeRuleOnInterface() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java
deleted file mode 100644
index fd4d56d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoFinalModifierRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myFinalMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java
deleted file mode 100644
index 84e8eb2..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoPackagePrivateMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myPackagePrivateMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java
deleted file mode 100644
index 88241c1..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoPrivateMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myPrivateMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java
deleted file mode 100644
index 3a58354..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoProtectedMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myProtectedMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java
deleted file mode 100644
index 7aae53e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoStaticModifierRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myStaticMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java
deleted file mode 100644
index a423f02..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebParam;
-import javax.jws.WebParam.Mode;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebParamModeHolderTypeRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair modeValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- WebParam.class.getCanonicalName(), "mode", Mode.OUT);
-
- memberValuePairs.add(modeValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebParam.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyClass\")\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod(String param) {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
- return classContents.toString();
- }
-
- public void testWebParamModeHolderTypeRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "param");
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(localVariable, WebParam.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(localVariable, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertTrue(source.getImport(WebParam.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java
deleted file mode 100644
index 7fa8fdf..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceDefaultPublicConstructorRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "MyClassPort");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "MyClassService");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic MyClass(String arg) {\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceDefaultPublicConstructorRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
-
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java
deleted file mode 100644
index 2a08327..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-public class WebServiceNoAbstractModifierRuleTest extends AbstractWebServicePublicAbstractFinalRuleTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public abstract class MyClass {\n\n");
- classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java
deleted file mode 100644
index bfc91f7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-public class WebServiceNoFinalModiferRuleTest extends AbstractWebServicePublicAbstractFinalRuleTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public final class MyClass {\n\n");
- classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java
deleted file mode 100644
index d84c431..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceNoFinalizeMethodRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "MyClassPort");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "MyClassService");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic void finalize() {\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceNoFinalizeMethodRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_OVERRIDE_FINALIZE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java
deleted file mode 100644
index 230de1e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoEndpointInterfaceRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair endpointInterfaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "endpointInterface", "MyInterface");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(endpointInterfaceValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyInterface.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceSEINoEndpointInterfaceRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENDPOINTINTERFACE_SEI,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java
deleted file mode 100644
index d0c7f37..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.Oneway;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoOnewayRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, Oneway.class.getSimpleName(), null);
- }
-
- public void testWebServiceSEIPresentNoOnewayRule() {
- try {
- assertNotNull(annotation);
- assertEquals(Oneway.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("methodOne", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, Oneway.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(Oneway.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java
deleted file mode 100644
index 4f9f045..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoPortNameRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "MyClassPort");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyInterface.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceSEINoPortNameRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_PORTNAME_SEI,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java
deleted file mode 100644
index cad1b99..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoSOAPBindingRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), null);
- }
-
- public void testNoSOAPBindingOnMethodRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
- public void testNoSOAPBindingOnTypeRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-
-
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java
deleted file mode 100644
index 86335fb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoServiceNameRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "MyClassService");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyInterface.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceSEINoServiceNameRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_SERVICENAME_SEI,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java
deleted file mode 100644
index ae49209..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoWebMethodRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), null);
- }
-
- public void testWebServiceSEIPresentNoWebMethodRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java
deleted file mode 100644
index 58b94c9..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebParam;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoWebParamRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebParam.class.getSimpleName(), null);
- }
-
- public void testWebServiceSEIPresentNoWebParamRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("methodOne", new String[] { "QString;" });
- assertNotNull(method);
-
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "in");
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(localVariable, WebParam.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(localVariable, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertTrue(source.getImport(WebParam.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java
deleted file mode 100644
index 4b0f28b..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebResult;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoWebResultRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebResult.class.getSimpleName(), null);
- }
-
- public void testWebServiceSEIPresentNoWebResultRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebResult.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebResult.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebResult.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java
deleted file mode 100644
index 150d340..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceWebServiceProviderCoExistRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), null);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.xml.transform.Source;\n");
- classContents.append("import javax.xml.ws.Provider;\n");
- classContents.append("import javax.xml.ws.WebServiceProvider;\n\n");
- classContents.append("@WebServiceProvider\n");
- classContents.append("public class MyClass implements Provider<Source> {\n\n");
- classContents.append("\tpublic Source invoke(Source arg0) {" + "\n\t\treturn null;\n\t}\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceWebServiceProviderCoExistRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java
deleted file mode 100644
index b4fb378..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.internal.resources.ResourceException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public abstract class AbstractAnnotationTest extends TestCase {
- protected TestJavaProject testJavaProject;
- protected ICompilationUnit source;
- protected CompilationUnit compilationUnit;
- protected AST ast;
- protected ASTRewrite rewriter;
- protected Annotation annotation;
- protected TextFileChange textFileChange;
-
- @Override
- protected void setUp() throws Exception {
- testJavaProject = new TestJavaProject("JavaProject");
- testJavaProject.setAutoBuilding(isAutoBuildingEnabled());
- testJavaProject.enableAnnotationProcessing(isAnnotationProcessingEnabled());
-
- source = testJavaProject.createCompilationUnit(getPackageName(), getClassName(), getClassContents());
-
- compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- ast = compilationUnit.getAST();
- rewriter = ASTRewrite.create(ast);
- annotation = getAnnotation();
- textFileChange = new TextFileChange("Add annotation", (IFile) source.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
- }
-
- protected boolean isAutoBuildingEnabled() {
- return false;
- }
-
- protected boolean isAnnotationProcessingEnabled() {
- return false;
- }
-
- protected abstract String getPackageName();
- protected abstract String getClassName();
- protected abstract String getClassContents();
- protected abstract Annotation getAnnotation();
-
- protected boolean executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return false;
- }
-
- change.initializeValidationData(monitor);
-
- PerformChangeOperation changeOperation = new PerformChangeOperation(change);
-
- try {
- changeOperation.run(monitor);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- return changeOperation.changeExecuted();
- }
-
- @Override
- protected void tearDown() throws Exception {
- deleteProject(testJavaProject.getProject());
- }
-
- private void deleteProject(IProject project) throws CoreException, InterruptedException {
- int noAttempts = 0;
- while (project != null && project.exists() && noAttempts < 5) {
- try {
- noAttempts++;
- if (project.isOpen()) {
- project.close(null);
- }
- project.delete(true, true, null);
- } catch (ResourceException re) {
- System.out.println(re.getLocalizedMessage());
- Thread.sleep(1);
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToFieldTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToFieldTest.java
deleted file mode 100644
index bac692e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToFieldTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddAnnotationToFieldTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- return "package com.example;\n\npublic class MyClass {\n\n\tstatic String service;\n\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair wsdlLocationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "wsdlLocation", "http://localhost:8083/ServiceProject/servives/MyService?WSDL");
-
- memberValuePairs.add(wsdlLocationValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebServiceRef.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToField() {
- try {
- assertNotNull(annotation);
- assertEquals(WebServiceRef.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IField field = source.findPrimaryType().getField("service");
- assertNotNull(field);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(field, WebServiceRef.class.getCanonicalName()));
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(field, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(WebServiceRef.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java
deleted file mode 100644
index a12295b..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddAnnotationToMethodParameterTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "i");
-
- memberValuePairs.add(nameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebParam.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToMethodParameter() {
- try {
- assertNotNull(annotation);
- assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
- assertNotNull(method);
-
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "i");
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(localVariable, WebParam.class.getCanonicalName()));
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(localVariable, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertTrue(source.getImport(WebParam.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java
deleted file mode 100644
index 1efe61d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddAnnotationToMethodTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "operationName", "add");
-
- memberValuePairs.add(operationValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToMethod() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java
deleted file mode 100644
index 044fad3..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class AddAnnotationToTypeTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore
- .createStringMemberValuePair(ast, "name", "Calculator");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", JDTUtils.getTargetNamespaceFromPackageName(getPackageName()));
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "CalculatorPort");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "CalculatorService");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToType() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddMemberValuePairToAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddMemberValuePairToAnnotationTest.java
deleted file mode 100644
index 56ff519..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddMemberValuePairToAnnotationTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddMemberValuePairToAnnotationTest extends AbstractAnnotationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return null;
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n");
- classContents.append("import javax.jws.WebMethod;\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("import javax.xml.ws.WebServiceRef;\n\n");
- classContents.append("@WebService()\n");
- classContents.append("public class Calculator {\n\n");
- classContents.append("\t@WebServiceRef()\n");
- classContents.append("\tpublic String myField;\n\n");
- classContents.append("\t@WebMethod()\n");
- classContents.append("\tpublic int add(@WebParam() int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testAddMemberValuePairToAnnotation() {
- try {
- //@WebService
- IType type = source.findPrimaryType();
- assertTrue(AnnotationUtils.isAnnotationPresent(source, "WebService"));
- Annotation webService = AnnotationUtils.getAnnotation(type, WebService.class);
- assertNotNull(webService);
- assertTrue(webService instanceof NormalAnnotation);
-
- NormalAnnotation webServiceAnnotation = (NormalAnnotation) webService;
- assertTrue(webServiceAnnotation.values().size() == 0);
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "Calculator");
-
- AnnotationUtils.addMemberValuePair(webServiceAnnotation, nameValuePair);
- webServiceAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(type, WebService.class);
- assertTrue(webServiceAnnotation.values().size() == 1);
-
- //@WebServiceRef
- IField field = type.getField("myField");
- assertTrue(AnnotationUtils.isAnnotationPresent(field, "WebServiceRef"));
- Annotation webServiceRef = AnnotationUtils.getAnnotation(field, WebServiceRef.class);
- assertNotNull(webServiceRef);
- assertTrue(webServiceRef instanceof NormalAnnotation);
-
- NormalAnnotation webServiceRefAnnotation = (NormalAnnotation) webServiceRef;
- assertTrue(webServiceRefAnnotation.values().size() == 0);
-
- MemberValuePair mappedNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "mappedName", "myField");
-
- AnnotationUtils.addMemberValuePair(webServiceRefAnnotation, mappedNameValuePair);
- webServiceRefAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(field, WebServiceRef.class);
- assertTrue(webServiceRefAnnotation.values().size() == 1);
-
- //@WebMethod
- IMethod method = type.getMethod("add", new String[] { "I", "I" });
- assertTrue(AnnotationUtils.isAnnotationPresent(method, "WebMethod"));
- Annotation webMethod = AnnotationUtils.getAnnotation(method, WebMethod.class);
- assertNotNull(webMethod);
- assertTrue(webMethod instanceof NormalAnnotation);
-
- NormalAnnotation webMethodAnnotation = (NormalAnnotation) webMethod;
- assertTrue(webMethodAnnotation.values().size() == 0);
-
- MemberValuePair operationNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "operationName", "add");
-
- AnnotationUtils.addMemberValuePair(webMethodAnnotation, operationNameValuePair);
- webMethodAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(method, WebMethod.class);
- assertTrue(webMethodAnnotation.values().size() == 1);
-
- //@WebParam
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "i");
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, "WebParam"));
- Annotation webParam = AnnotationUtils.getAnnotation(localVariable, WebParam.class);
- assertNotNull(webParam);
- assertTrue(webParam instanceof NormalAnnotation);
-
- NormalAnnotation webParamAnnotation = (NormalAnnotation) webParam;
- assertTrue(webParamAnnotation.values().size() == 0);
-
- MemberValuePair partNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "partName", "i");
-
- AnnotationUtils.addMemberValuePair(webParamAnnotation, partNameValuePair);
- webParamAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(localVariable, WebParam.class);
- assertTrue(webParamAnnotation.values().size() == 1);
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java
deleted file mode 100644
index 8bebf15..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JAXWSCoreTestSuite extends TestSuite {
-
- public static Test suite() {
- return new JAXWSCoreTestSuite();
- }
-
- public JAXWSCoreTestSuite() {
- super("JAX-WS Core Tests");
- addTestSuite(AddAnnotationToTypeTest.class);
- addTestSuite(RemoveAnnotationFromTypeTest.class);
- addTestSuite(AddAnnotationToFieldTest.class);
- addTestSuite(RemoveAnnotationFromFieldTest.class);
- addTestSuite(AddAnnotationToMethodTest.class);
- addTestSuite(RemoveAnnotationFromMethodTest.class);
- addTestSuite(AddAnnotationToMethodParameterTest.class);
- addTestSuite(RemoveAnnotationFromMethodParameterTest.class);
- addTestSuite(AddMemberValuePairToAnnotationTest.class);
- addTestSuite(RemoveMemberValuePairTest.class);
- addTestSuite(UpdateMemberValuePairTest.class);
- addTestSuite(UpdateSingleMemberAnnotationTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java
deleted file mode 100644
index 4abfdf7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromFieldTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.xml.ws.WebServiceRef;\n\n");
- classContents.append("public class MyClass {\n\n\t@WebServiceRef()\n\tstatic String service;\n\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebServiceRef.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromField() {
- try {
- assertNotNull(annotation);
- assertEquals(WebServiceRef.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IField field = source.findPrimaryType().getField("service");
- assertNotNull(field);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils
- .getAnnotationName(annotation)));
-
- assertNotNull(source.getImport(WebServiceRef.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(field, annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(field, WebServiceRef.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils.getAnnotationName(annotation)));
- assertFalse(source.getImport(WebServiceRef.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java
deleted file mode 100644
index 9070b14..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromMethodParameterTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n\n");
- classContents.append("public class Calculator {\n\n\tpublic int add(@WebParam(name=\"i\")");
- classContents.append("int i, int k) {\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebParam.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromMethodParameter() {
- try {
- assertNotNull(annotation);
- assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
- assertNotNull(method);
-
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "i");
-
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertNotNull(source.getImport(WebParam.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(localVariable, annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(localVariable, WebParam.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertFalse(source.getImport(WebParam.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java
deleted file mode 100644
index b92a1a4..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromMethodTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebMethod;\n\n");
- classContents.append("public class Calculator {\n\n\t@WebMethod\n\tpublic int add(int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromMethod() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
- assertNotNull(method);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertNotNull(source.getImport(WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(method, annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertFalse(source.getImport(WebMethod.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java
deleted file mode 100644
index 69337d6..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromTypeTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyClass\", endpointInterface=\"MyInterface\", ");
- classContents.append("targetNamespace=\"http://example.com/\", portName=\"MyClassPort\", ");
- classContents.append("serviceName=\"MyClassService\")\n");
- classContents.append("public class MyClass {\n\n");
- classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromType() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils.getAnnotationName(annotation)));
- assertNotNull(source.getImport(WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(source.findPrimaryType(), annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils.getAnnotationName(annotation)));
- assertFalse(source.getImport(WebService.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveMemberValuePairTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveMemberValuePairTest.java
deleted file mode 100644
index 84032f4..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveMemberValuePairTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebService;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveMemberValuePairTest extends AbstractAnnotationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return null;
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"Calculator\")\n");
- classContents.append("public class Calculator {\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testRemoveMemberValuePairFromAnnotation() {
- try {
- IType type = source.findPrimaryType();
- assertTrue(AnnotationUtils.isAnnotationPresent(source, "WebService"));
- Annotation webService = AnnotationUtils.getAnnotation(type, WebService.class);
- assertNotNull(webService);
- assertTrue(webService instanceof NormalAnnotation);
-
- NormalAnnotation webServiceAnnotation = (NormalAnnotation) webService;
- assertTrue(webServiceAnnotation.values().size() == 1);
-
- MemberValuePair nameValuePair = AnnotationUtils.getMemberValuePair(webServiceAnnotation, "name");
-
- AnnotationUtils.removeMemberValuePair(webServiceAnnotation, nameValuePair);
- webServiceAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(type, WebService.class);
- assertTrue(webServiceAnnotation.values().size() == 0);
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java
deleted file mode 100644
index 5a0b5b8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-public class TestJavaProject extends TestProject {
- private IJavaProject javaProject;
-
- public TestJavaProject(String projectName) throws CoreException {
- super(projectName);
- javaProject = JavaCore.create(getProject());
- addProjectNature(getProject(), JavaCore.NATURE_ID);
-
- javaProject.setRawClasspath(new IClasspathEntry[0], null);
-
- createSourceFolder();
- addToClasspath(javaProject, getJREContainerEntry());
- createOutputFolder();
- }
-
- public void setAutoBuilding(boolean autoBuild) throws CoreException {
- IWorkspaceDescription description = ResourcesPlugin.getWorkspace().getDescription();
- description.setAutoBuilding(autoBuild);
- ResourcesPlugin.getWorkspace().setDescription(description);
- }
-
- public void enableAnnotationProcessing(boolean enable) {
- AptConfig.setEnabled(javaProject, enable);
- }
-
- private IClasspathEntry getJREContainerEntry() {
- IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
- if (defaultVMInstall != null && isJava6OrGreaterJRE(defaultVMInstall)) {
- return JavaRuntime.getDefaultJREContainerEntry();
- }
-
- IVMInstallType[] installTypes = JavaRuntime.getVMInstallTypes();
- for (IVMInstallType installType : installTypes) {
- IVMInstall[] vmInstalls = installType.getVMInstalls();
- for (IVMInstall vmInstall : vmInstalls) {
- if (isJava6OrGreaterJRE(vmInstall)) {
- return JavaCore.newContainerEntry(JavaRuntime.newJREContainerPath(installType.getId(),
- vmInstall.getName()));
- }
- }
- }
-
- return JavaRuntime.getDefaultJREContainerEntry();
- }
-
- private boolean isJava6OrGreaterJRE(IVMInstall vmInstall) {
- if (vmInstall instanceof IVMInstall2) {
- IVMInstall2 vmInstall2 = (IVMInstall2) vmInstall;
- if (vmInstall2.getJavaVersion().compareTo(JavaCore.VERSION_1_6) > 0) {
- return true;
- }
- }
- return false;
- }
-
- public ICompilationUnit createCompilationUnit(String packageName, String name, String contents) throws JavaModelException {
- return getPackageFragment(packageName).createCompilationUnit(name, contents, false, monitor);
- }
-
- private IPackageFragment getPackageFragment(String packageName) throws JavaModelException {
- return getPackageFragmentRoot().createPackageFragment(packageName, true, monitor);
- }
-
- private IPackageFragmentRoot getPackageFragmentRoot() {
- return getJavaProject().getPackageFragmentRoot(getProject().getFolder("src"));
- }
-
- private void createSourceFolder() throws CoreException {
- IFolder srcDir = getProject().getFolder("src");
- mkdirs(srcDir);
- addToClasspath(javaProject, JavaCore.newSourceEntry(srcDir.getFullPath()));
- }
-
- private void createOutputFolder() throws CoreException {
- IFolder outputDir = getProject().getFolder("bin");
- mkdirs(outputDir);
- getJavaProject().setOutputLocation(outputDir.getFullPath(), monitor);
- }
-
- public IJavaProject getJavaProject() {
- return javaProject;
- }
-
- public void addToClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
- try {
- IClasspathEntry[] currentClasspathEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newClasspathEntries = new IClasspathEntry[currentClasspathEntries.length + 1];
- System.arraycopy(currentClasspathEntries, 0, newClasspathEntries, 0,
- currentClasspathEntries.length);
- newClasspathEntries[currentClasspathEntries.length] = classpathEntry;
- javaProject.setRawClasspath(newClasspathEntries, new NullProgressMonitor());
- } catch (JavaModelException jme) {
- jme.printStackTrace();
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java
deleted file mode 100644
index a3deae8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class TestProject {
- IProgressMonitor monitor = new NullProgressMonitor();
-
- private IProject testProject;
-
- public TestProject(String projectName) throws CoreException {
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- testProject = workspaceRoot.getProject(projectName);
- testProject.create(monitor);
- testProject.open(monitor);
- }
-
- public IProject getProject() {
- return testProject;
- }
-
- public void addProjectNature(IProject project, String nature) {
- try {
- IProjectDescription projectDescription = project.getDescription();
- String[] previousNatures = projectDescription.getNatureIds();
- String[] newNatures = new String[previousNatures.length + 1];
- System.arraycopy(previousNatures, 0, newNatures, 0, previousNatures.length);
- newNatures[previousNatures.length] = nature;
- projectDescription.setNatureIds(newNatures);
- project.setDescription(projectDescription, null);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-
- public void mkdirs(final IFolder folder) {
- try {
- if (!folder.exists() && folder.getParent().isAccessible()) {
- folder.create(true, true, null);
- }
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateMemberValuePairTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateMemberValuePairTest.java
deleted file mode 100644
index 29daf1a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateMemberValuePairTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class UpdateMemberValuePairTest extends AbstractAnnotationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return null;
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n");
- classContents.append("import javax.jws.WebMethod;\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("import javax.xml.ws.WebServiceRef;\n\n");
- classContents.append("@WebService(name=\"Calculator\")\n");
- classContents.append("public class Calculator {\n\n");
- classContents.append("\t@WebServiceRef(mappedName=\"myField\")\n");
- classContents.append("\tpublic String myField;\n\n");
- classContents.append("\t@WebMethod(operationName=\"add\")\n");
- classContents.append("\tpublic int add(@WebParam(partName=\"i\") int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testUpdateMemberValuePair() {
- try {
- //@WebService
- IType type = source.findPrimaryType();
- assertTrue(AnnotationUtils.isAnnotationPresent(source, "WebService"));
- Annotation webService = AnnotationUtils.getAnnotation(type, WebService.class);
- assertNotNull(webService);
- assertTrue(webService instanceof NormalAnnotation);
-
- NormalAnnotation webServiceAnnotation = (NormalAnnotation) webService;
- assertTrue(webServiceAnnotation.values().size() == 1);
-
- MemberValuePair nameValuePair = AnnotationUtils.getMemberValuePair(webServiceAnnotation, "name");
- assertNotNull(nameValuePair);
- StringLiteral nameValue = (StringLiteral) nameValuePair.getValue();
- assertTrue(nameValue.getLiteralValue().equals("Calculator"));
-
- AnnotationUtils.updateMemberValuePair(nameValuePair, AnnotationsCore.createStringLiteral(ast, "ScientificCalculator"));
- webServiceAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(type, WebService.class);
- nameValuePair = AnnotationUtils.getMemberValuePair(webServiceAnnotation, "name");
- nameValue = (StringLiteral) nameValuePair.getValue();
- assertTrue(nameValue.getLiteralValue().equals("ScientificCalculator"));
-
- //@WebServiceRef
- IField field = type.getField("myField");
- assertTrue(AnnotationUtils.isAnnotationPresent(field, "WebServiceRef"));
- Annotation webServiceRef = AnnotationUtils.getAnnotation(field, WebServiceRef.class);
- assertNotNull(webServiceRef);
- assertTrue(webServiceRef instanceof NormalAnnotation);
-
- NormalAnnotation webServiceRefAnnotation = (NormalAnnotation) webServiceRef;
- assertTrue(webServiceRefAnnotation.values().size() == 1);
-
- MemberValuePair mappedNameValuePair = AnnotationUtils.getMemberValuePair(webServiceRefAnnotation, "mappedName");
- assertNotNull(mappedNameValuePair);
- StringLiteral mappedNameValue = (StringLiteral) mappedNameValuePair.getValue();
- assertTrue(mappedNameValue.getLiteralValue().equals("myField"));
-
- AnnotationUtils.updateMemberValuePair(mappedNameValuePair, AnnotationsCore.createStringLiteral(ast, "anotherField"));
- webServiceRefAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(field, WebServiceRef.class);
- mappedNameValuePair = AnnotationUtils.getMemberValuePair(webServiceRefAnnotation, "mappedName");
- mappedNameValue = (StringLiteral) mappedNameValuePair.getValue();
- assertTrue(mappedNameValue.getLiteralValue().equals("anotherField"));
-
- //@WebMethod
- IMethod method = type.getMethod("add", new String[] { "I", "I" });
- assertTrue(AnnotationUtils.isAnnotationPresent(method, "WebMethod"));
- Annotation webMethod = AnnotationUtils.getAnnotation(method, WebMethod.class);
- assertNotNull(webMethod);
- assertTrue(webMethod instanceof NormalAnnotation);
-
- NormalAnnotation webMethodAnnotation = (NormalAnnotation) webMethod;
- assertTrue(webMethodAnnotation.values().size() == 1);
-
- MemberValuePair operationNameValuePair = AnnotationUtils.getMemberValuePair(webMethodAnnotation, "operationName");
- assertNotNull(operationNameValuePair);
- StringLiteral operationNameValue = (StringLiteral) operationNameValuePair.getValue();
- assertTrue(operationNameValue.getLiteralValue().equals("add"));
-
- AnnotationUtils.updateMemberValuePair(operationNameValuePair, AnnotationsCore.createStringLiteral(ast, "multiply"));
- webMethodAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(method, WebMethod.class);
- operationNameValuePair = AnnotationUtils.getMemberValuePair(webMethodAnnotation, "operationName");
- operationNameValue = (StringLiteral) operationNameValuePair.getValue();
- assertTrue(operationNameValue.getLiteralValue().equals("multiply"));
-
- //@WebParam
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "i");
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, "WebParam"));
- Annotation webParam = AnnotationUtils.getAnnotation(localVariable, WebParam.class);
- assertNotNull(webParam);
- assertTrue(webParam instanceof NormalAnnotation);
-
- NormalAnnotation webParamAnnotation = (NormalAnnotation) webParam;
- assertTrue(webParamAnnotation.values().size() == 1);
-
- MemberValuePair partNameValuePair = AnnotationUtils.getMemberValuePair(webParamAnnotation, "partName");
- assertNotNull(partNameValuePair);
- StringLiteral partNameValue = (StringLiteral) partNameValuePair.getValue();
- assertTrue(partNameValue.getLiteralValue().equals("i"));
-
- AnnotationUtils.updateMemberValuePair(partNameValuePair, AnnotationsCore.createStringLiteral(ast, "iii"));
- webParamAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(localVariable, WebParam.class);
- partNameValuePair = AnnotationUtils.getMemberValuePair(webParamAnnotation, "partName");
- partNameValue = (StringLiteral) partNameValuePair.getValue();
- assertTrue(partNameValue.getLiteralValue().equals("iii"));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateSingleMemberAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateSingleMemberAnnotationTest.java
deleted file mode 100644
index 29da147..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateSingleMemberAnnotationTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.xml.ws.BindingType;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class UpdateSingleMemberAnnotationTest extends AbstractAnnotationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return null;
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.xml.ws.BindingType;\n\n");
- classContents.append("@BindingType(\"http://schemas.xmlsoap.org/wsdl/soap/http\")\n");
- classContents.append("public class Calculator {\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testUpdateSingleMemberAnnotation() {
- try {
- IType type = source.findPrimaryType();
- assertTrue(AnnotationUtils.isAnnotationPresent(source, "BindingType"));
- Annotation bindingType = AnnotationUtils.getAnnotation(type, BindingType.class);
- assertNotNull(bindingType);
- assertTrue(bindingType instanceof SingleMemberAnnotation);
-
- SingleMemberAnnotation bindingTypeAnnotation = (SingleMemberAnnotation) bindingType;
- StringLiteral bindingTypeValue = (StringLiteral) bindingTypeAnnotation.getValue();
- assertTrue(bindingTypeValue.getLiteralValue().equals("http://schemas.xmlsoap.org/wsdl/soap/http"));
-
- AnnotationUtils.updateSingleMemberAnnotation(bindingTypeAnnotation, AnnotationsCore.createStringLiteral(ast, "http://www.w3.org/2003/05/soap/bindings/HTTP/"));
- bindingTypeAnnotation = (SingleMemberAnnotation) AnnotationUtils.getAnnotation(type, BindingType.class);
- bindingTypeValue = (StringLiteral) bindingTypeAnnotation.getValue();
- assertTrue(bindingTypeValue.getLiteralValue().equals("http://www.w3.org/2003/05/soap/bindings/HTTP/"));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.project b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.project
deleted file mode 100755
index e347d1e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.ui.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.jaxws.dom.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-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.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100755
index 43cbc5f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.dom.ui.tests
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.jst.ws.jaxws.dom.runtime,
- org.eclipse.jst.ws.jaxws.dom.ui,
- org.eclipse.jst.ws.jaxws.testutils,
- org.jmock,
- org.junit
-Export-Package: org.eclipse.jst.ws.jaxws.dom.ui.tests,
- org.eclipse.jst.ws.jaxws.dom.ui.tests.internal
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/about.html b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</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
-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.jaxws.dom.ui.tests/build.properties b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/build.properties
deleted file mode 100755
index cc88efd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/plugin.properties
deleted file mode 100755
index a168b6f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=DOM UI Tests (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/AllTestsSuite.java b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/AllTestsSuite.java
deleted file mode 100755
index 92b4d86..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.jaxws.dom.ui.tests.internal.AllDomItemProviderTest;
-import org.eclipse.jst.ws.jaxws.dom.ui.tests.internal.DOMItemPropertyProviderTest;
-
-public class AllTestsSuite
-{
- public static Test suite()
- {
- final TestSuite suite = new TestSuite();
-
- suite.addTestSuite(AllDomItemProviderTest.class);
- suite.addTestSuite(DOMItemPropertyProviderTest.class);
-
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/AllDomItemProviderTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/AllDomItemProviderTest.java
deleted file mode 100755
index e638ceb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/AllDomItemProviderTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.tests.internal;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor.PropertyValueWrapper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-import org.eclipse.jst.ws.jaxws.dom.ui.DomItemProviderAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.ui.IJavaWebServiceElementItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IServiceEndpointInterfaceItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IWebMethodItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IWebParamItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IWebServiceItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IWebServiceProjectItemProvider;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.jmock.Mock;
-
-public class AllDomItemProviderTest extends MockObjectTestCase
-{
- private DomItemProviderAdapterFactory itemProvider;
-
- @Override
- public void setUp()
- {
- itemProvider = new DomItemProviderAdapterFactory();
- }
-
- @Override
- public void tearDown()
- {
- itemProvider.dispose();
- }
-
- public void testDOMItemProvider()
- {
- assertNotNull(itemProvider.getRootAdapterFactory());
- itemProvider.setParentAdapterFactory(null);
- assertNotNull(itemProvider.getRootAdapterFactory());
- itemProvider.removeListener(null);
- assertNotNull(itemProvider.getRootAdapterFactory());
- }
-
- public void testIJavaWebServiceElementItemProvider()
- {
- IJavaWebServiceElementItemProvider javaItemProvider = (IJavaWebServiceElementItemProvider) itemProvider.createIJavaWebServiceElementAdapter();
-
- assertNotNull(javaItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = javaItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock javaWSElem = mock(IJavaWebServiceElement.class);
- javaWSElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(javaItemProvider.getImage(new Object()));
- assertNotNull(javaItemProvider.getText(javaWSElem.proxy()));
- assertNull(javaItemProvider.getNameCategory());
- }
-
- public void testIServiceEndpointItemProvider()
- {
- IServiceEndpointInterfaceItemProvider seiItemProvider = (IServiceEndpointInterfaceItemProvider) itemProvider.createIServiceEndpointInterfaceAdapter();
-
- assertNotNull(seiItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = seiItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock sEIElem = mock(IServiceEndpointInterface.class);
- sEIElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(seiItemProvider.getImage(new Object()));
- assertNotNull(seiItemProvider.getText(sEIElem.proxy()));
- assertNotNull(seiItemProvider.getChildrenFeatures(null));
- assertNotNull(seiItemProvider.getNameCategory());
- }
-
- public void testIWebMethodItemProvider()
- {
- IWebMethodItemProvider methodItemProvider = (IWebMethodItemProvider) itemProvider.createIWebMethodAdapter();
-
- assertNotNull(methodItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = methodItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock wMElem = mock(IWebMethod.class);
- wMElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(methodItemProvider.getImage(new Object()));
- assertNotNull(methodItemProvider.getText(wMElem.proxy()));
- assertNotNull(methodItemProvider.getChildrenFeatures(null));
- assertNotNull(methodItemProvider.getNameCategory());
- }
-
- public void testIWebServiceItemProvider()
- {
- IWebServiceItemProvider wsItemProvider = (IWebServiceItemProvider) itemProvider.createIWebServiceAdapter();
-
- assertNotNull(wsItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = wsItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock wsElem = mock(IWebService.class);
- wsElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(wsItemProvider.getImage(new Object()));
- assertNotNull(wsItemProvider.getText(wsElem.proxy()));
- assertNotNull(wsItemProvider.getNameCategory());
- }
-
- public void testIWebServiceProjectItemProvider()
- {
- IWebServiceProjectItemProvider wsProjItemProvider = (IWebServiceProjectItemProvider) itemProvider.createIWebServiceProjectAdapter();
-
- assertNotNull(wsProjItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = wsProjItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock wsProjElem = mock(IWebServiceProject.class);
- wsProjElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(wsProjItemProvider.getImage(new Object()));
- assertNotNull(wsProjItemProvider.getText(wsProjElem.proxy()));
- assertNotNull(wsProjItemProvider.getChildrenFeatures(null));
- }
-
- public void testIWebMethodItemProviderGetImplementation()
- {
- IWebMethodItemProvider methodItemProvider = (IWebMethodItemProvider) itemProvider.createIWebMethodAdapter();
- assertNotNull(methodItemProvider);
-
- Mock webParam1 = mock(IWebParam.class);
- webParam1.expects(atLeastOnce()).method("getName").will(returnValue("Param1"));
- webParam1.expects(atLeastOnce()).method("getTypeName").will(returnValue("boolean"));
- Mock webParam2 = mock(IWebParam.class);
- webParam2.expects(atLeastOnce()).method("getName").will(returnValue("return"));
- webParam2.expects(atLeastOnce()).method("getTypeName").will(returnValue("java.lang.String"));
- org.eclipse.emf.common.util.EList<IWebParam> webParams = new org.eclipse.emf.common.util.BasicEList<IWebParam>();
- webParams.add((IWebParam)webParam1.proxy());
- webParams.add((IWebParam)webParam2.proxy());
- Mock webMethod = mock(IWebMethod.class);
- webMethod.expects(atLeastOnce()).method("getParameters").will(returnValue(webParams));
- webMethod.expects(atLeastOnce()).method("getImplementation").will(returnValue("testMethod(B)QString"));
-
- BasicEList<StateAdapter> adapters = new org.eclipse.emf.common.util.BasicEList<StateAdapter>();
- Mock adapter = mock(StateAdapter.class);
- adapter.stubs().method("isAdapterForType").will(returnValue(true));
- adapter.stubs().method("isChangeable").will(returnValue(false));
- adapters.add((StateAdapter)adapter.proxy());
-
- webMethod.expects(atLeastOnce()).method("eAdapters").will(returnValue(adapters));
- ((IWebMethod)webMethod.proxy()).eAdapters();
- methodItemProvider.setTarget((Notifier)webMethod.proxy());
- List<IItemPropertyDescriptor> propDescs = methodItemProvider.getPropertyDescriptors(webMethod.proxy());
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- for(IItemPropertyDescriptor propDesc : propDescs)
- {
- if(propDesc.getFeature(null).equals(DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION))
- {
- assertEquals(((PropertyValueWrapper)propDesc.getPropertyValue(webMethod.proxy())).getText(null), "String testMethod(boolean)");
- }
- }
- }
-
- public void testIWebParamItemProvider()
- {
- IWebParamItemProvider itemProvider = (IWebParamItemProvider) new DomItemProviderAdapterFactory().createIWebParamAdapter();
- Mock paramMock = mock(IWebParam.class);
- assertNotNull(itemProvider.getImage(new Object()));
-
- paramMock.stubs().method("getName").will(returnValue("myParam"));
- paramMock.stubs().method("getTypeName").will(returnValue("java.util.List"));
- paramMock.stubs().method("getImplementation").will(returnValue("test"));
- paramMock.stubs().method("eContainer").will(returnValue(null));
- paramMock.stubs().method("eResource").will(returnValue(null));
-
- assertEquals("myParam", itemProvider.getText(paramMock.proxy()));
- assertNotNull(itemProvider.getImage(paramMock.proxy()));
- assertNotNull(itemProvider.getNameCategory());
- paramMock.stubs().method("getImplementation").will(returnValue("return"));
- assertNotNull(itemProvider.getImage(paramMock.proxy()));
- }
-
- public void testIWebParamItemProviderForTypeName()
- {
- // IWebParamItemProvider itemProvider = (IWebParamItemProvider) new DomItemProviderAdapterFactory().createIWebParamAdapter();
- final IItemPropertyDescriptor typeNamePropertyDescriptor = findWebParamItemPropertyDescriptor(DomPackage.Literals.IWEB_PARAM__TYPE_NAME);
-
- final IWebParam webParam = DomFactory.eINSTANCE.createIWebParam();
- webParam.setHeader(true);
- webParam.setKind(WebParamKind.INOUT);
- webParam.setName("anyName"); //$NON-NLS-1$
- webParam.setPartName("anyPartName"); //$NON-NLS-1$
- webParam.setTargetNamespace("anyTargetNamespace"); //$NON-NLS-1$
- ((EObject) webParam).eSet(DomPackage.Literals.IWEB_PARAM__TYPE_NAME, null);
-
- assertNull("Unexpected value.", typeNamePropertyDescriptor.getPropertyValue(webParam)); //$NON-NLS-1$
-
- Object propertyValueWrapper = null;
-
- ((EObject) webParam).eSet(DomPackage.Literals.IWEB_PARAM__TYPE_NAME, "I"); //$NON-NLS-1$
- propertyValueWrapper = typeNamePropertyDescriptor.getPropertyValue(webParam);
- assertEquals("Unresolved value.", "int", ((IItemPropertySource) propertyValueWrapper).getEditableValue(null)); //$NON-NLS-1$ //$NON-NLS-2$
-
- ((EObject) webParam).eSet(DomPackage.Literals.IWEB_PARAM__TYPE_NAME, "[QString;"); //$NON-NLS-1$
- propertyValueWrapper = typeNamePropertyDescriptor.getPropertyValue(webParam);
- assertEquals("Unresolved value.", "String[]", ((IItemPropertySource) propertyValueWrapper).getEditableValue(null)); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- private IItemPropertyDescriptor findWebParamItemPropertyDescriptor(final EAttribute attribute)
- {
- final IWebParamItemProvider itemProvider = (IWebParamItemProvider) new DomItemProviderAdapterFactory().createIWebParamAdapter();
- List<IItemPropertyDescriptor> descriptors = itemProvider.getPropertyDescriptors(null);
-
- for (IItemPropertyDescriptor descriptor : descriptors)
- {
- if (descriptor.getFeature(null).equals(attribute))
- {
- return descriptor;
- }
- }
-
- return null;
- }
-
- public interface StateAdapter extends IPropertyState, Adapter
- {
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/DOMItemPropertyProviderTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/DOMItemPropertyProviderTest.java
deleted file mode 100755
index 8fbfcdd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/DOMItemPropertyProviderTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.tests.internal;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-
-/**
- * Tests for {@link DOMItemPropertyProvider} class
- * @author Georgi Vachkov
- */
-public class DOMItemPropertyProviderTest extends TestCase
-{
- private DOMItemPropertyProvider provider;
-
- public void setUp()
- {
- provider = new DOMItemPropertyProvider(
- null,
- null,
- "display name",
- "description",
- DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__NAME,
- true,
- false,
- false,
- null,
- "category",
- new String[0]);
- }
-
- public void testResetPropertyValue()
- {
- final IWebService ws = DomFactory.eINSTANCE.createIWebService();
- ws.eSet(DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, "org.eclipse.test.Sei");
- ws.setName("Test");
- provider.resetPropertyValue(ws);
- assertEquals("SeiService", ws.getName());
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/.classpath b/tests/org.eclipse.jst.ws.jaxws.testutils/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/.project b/tests/org.eclipse.jst.ws.jaxws.testutils/.project
deleted file mode 100755
index f7a3803..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.testutils</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.jaxws.testutils/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.testutils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-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.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF
deleted file mode 100755
index b861019..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.testutils
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.jmock,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.jdt.launching,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.ws.jaxws.utils,
- org.junit,
- org.eclipse.jdt.apt.core
-Export-Package: org.eclipse.jst.ws.jaxws.testutils,
- org.eclipse.jst.ws.jaxws.testutils.assertions,
- org.eclipse.jst.ws.jaxws.testutils.files,
- org.eclipse.jst.ws.jaxws.testutils.jmock,
- org.eclipse.jst.ws.jaxws.testutils.jmock.testcases,
- org.eclipse.jst.ws.jaxws.testutils.jobs,
- org.eclipse.jst.ws.jaxws.testutils.project,
- org.eclipse.jst.ws.jaxws.testutils.threading
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/about.html b/tests/org.eclipse.jst.ws.jaxws.testutils/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</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
-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.jaxws.testutils/build.properties b/tests/org.eclipse.jst.ws.jaxws.testutils/build.properties
deleted file mode 100755
index cc88efd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.testutils/plugin.properties
deleted file mode 100755
index 5830398..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=Utilities for JUnit tests (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/IWaitCondition.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/IWaitCondition.java
deleted file mode 100755
index da08e8f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/IWaitCondition.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils;
-
-import org.eclipse.jst.ws.jaxws.testutils.assertions.ConditionCheckException;
-
-/**
- * Interface which defines a condition upon which the execution can continue
- * @author Danail Branekov
- */
-public interface IWaitCondition
-{
- /**
- * Method which checks whether a given condition is met
- * @return <code>true</code> in case the condition is met, <code>false</code> otherwise
- * @throws ConditionCheckException when implementors decide that they cannot deal with a given exceptional situation
- */
- public boolean checkCondition() throws ConditionCheckException;
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/Assertions.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/Assertions.java
deleted file mode 100755
index cfb9ff5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/Assertions.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.assertions;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.testutils.IWaitCondition;
-import org.eclipse.jst.ws.jaxws.testutils.threading.TestContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Utility class which provides methods which assert that a given condition is met. If necessary, methods will block the execution of the caller until
- * the condition is met for a reasonable time. If the conditions is not met, <code>Assert.fail()</code> is invoked
- *
- * @author Danail Branekov
- *
- */
-public class Assertions
-{
- private final static int MAX_CONDITION_CHECKS = 5000;
-
- private final static int SLEEP_TIMEOUT = 42;
-
- /**
- * Asserts that waits some time until the condition specified is met. If the condition is not met after some reasonable time, the method calls Assert.fail()
- * @param condition the condition to check
- * @param failMessage the message which will be passed to <code>Assert.fail()</code> thus indicating a test failure
- */
- public static void waitAssert(final IWaitCondition condition, final String failMessage)
- {
- try
- {
- if (!waitForConditionLoop(condition))
- {
- Assert.fail(failMessage);
- }
- } catch (ConditionCheckException e)
- {
- failUponThrowable(e);
- }
- }
-
- /**
- * Blocks the execution of the caller until the <code>condition</code> is met or MAX_CONDITION_CHECKS attempts have been reached.<br>
- * The method behaviour slightly depends on whether the method is invoked from the UI thread or not
- * <li>If the caller is the UI thread, a new modal context thread is started which sleeps for {@link #SLEEP_TIMEOUT}
- * <li>If the caller is not the UI thread, then the current thread sleeps for {@link #SLEEP_TIMEOUT} <br>
- *
- * @param condition
- * condition on which the method will return if met
- * @throws ConditionCheckException
- */
- private static boolean waitForConditionLoop(final IWaitCondition condition) throws ConditionCheckException
- {
- int attempts = 0;
- while (attempts < MAX_CONDITION_CHECKS)
- {
- if (condition.checkCondition())
- {
- return true;
- }
-
- attempts++;
- final IRunnableWithProgress sleepRunnable = getSleepRunnable();
-
- try
- {
- TestContext.run(sleepRunnable, Display.getCurrent() != null, new NullProgressMonitor(), PlatformUI.getWorkbench().getDisplay());
- } catch (InvocationTargetException e)
- {
- throw new ConditionCheckException(e);
- } catch (InterruptedException e)
- {
- throw new ConditionCheckException(e);
- }
- }
-
- return false;
- }
-
- private static IRunnableWithProgress getSleepRunnable()
- {
- return new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- Thread.sleep(SLEEP_TIMEOUT);
- }
- };
- }
-
- private static void failUponThrowable(final Throwable t)
- {
- final StringBuilder msgBuilder = new StringBuilder(t.getMessage());
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter(stringWriter);
- t.printStackTrace(printWriter);
- msgBuilder.append(stringWriter.toString());
- msgBuilder.append("------------------------------------\n\n");
-
- Assert.fail(msgBuilder.toString());
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/ConditionCheckException.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/ConditionCheckException.java
deleted file mode 100755
index 9e691db..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/ConditionCheckException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.assertions;
-
-import org.eclipse.jst.ws.jaxws.testutils.IWaitCondition;
-
-
-/**
- * Exception which can be thrown by {@link IWaitCondition#checkCondition()} method. This is a wrapper exception which encloses the exception cause
- *
- * @author Danail Branekov
- */
-public class ConditionCheckException extends Exception
-{
- private static final long serialVersionUID = -4929080285506788984L;
-
- public ConditionCheckException(final Throwable cause)
- {
- super(cause);
- }
-
- public ConditionCheckException(final String message)
- {
- super(message);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/TestFileUtils.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/TestFileUtils.java
deleted file mode 100755
index 3532cbd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/TestFileUtils.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.files;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.nio.channels.FileChannel;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-
-public class TestFileUtils
-{
- // Hide default constructor
- private TestFileUtils()
- {
- };
-
- /** Get new instance of the FileUtilities object */
- public static TestFileUtils getInstance()
- {
- return new TestFileUtils();
- }
-
- /**
- * Utility method. Copies the contents of the source folder to the destination folder.
- */
- public boolean copyFiles(final File dest, final File src) throws IOException
- {
-
- if (src.isDirectory())
- {
- dest.mkdirs();
- final String list[] = src.list();
-
- for (int i = 0; i < list.length; i++)
- {
- final String dest1 = dest.getAbsolutePath() + "\\" + list[i];
- final String src1 = src.getAbsolutePath() + "\\" + list[i];
- copyFiles(new File(dest1), new File(src1));
- }
- } else
- {
- return copy(dest, src);
- }
-
- return false;
- }
-
- /**
- * Utility method for copying a file! - not a directory
- *
- * @param target
- * @param source
- * @throws IOException
- */
- public boolean copy(final File target, final File source) throws IOException
- {
- if (!source.isFile())
- return false;
-
- final FileChannel sourceChannel = new FileInputStream(source).getChannel();
- final FileChannel targetChannel = new FileInputStream(target).getChannel();
- sourceChannel.transferTo(0, sourceChannel.size(), targetChannel);
- sourceChannel.close();
- targetChannel.close();
-
- return true;
- }
-
- /**
- *
- * @param destDir
- * @param srcRelativePath -
- * the relative path of the resource or <code>null</code> if it is in the same package
- * @param resourceName
- * @param resourceClass
- * @return
- * @throws IOException
- */
- public File copyResourceToDir(File destDir, InputStream srcStream, String resourceName) throws IOException
- {
- File destFile = new File(destDir.getAbsolutePath(), resourceName);
- copyFile(srcStream, new FileOutputStream(destFile));
- return destFile;
- }
- /**
- *
- * @param destDir
- * @param srcRelativePath -
- * the relative path of the resource or <code>null</code> if it is in the same package
- * @param srcFileName
- * @param resourceClass
- * @return
- * @throws IOException
- */
- public File copyResourceToDir(File destDir, String srcRelativePath, String srcFileName, Class<?> resourceClass) throws IOException
- {
- File destFile = new File(destDir.getAbsolutePath(), srcFileName);
- copyFile(createInputStreamForResource(srcRelativePath, srcFileName, resourceClass), new FileOutputStream(destFile));
- return destFile;
- }
-
- private InputStream createInputStreamForResource(String srcRelativePath, String srcFileName, Class<?> resourceClass)
- {
- return resourceClass.getResourceAsStream(createResourcePath(srcRelativePath) + srcFileName);
- }
-
- private String createResourcePath(String srcRelativePath)
- {
- return (srcRelativePath == null) ? "" : srcRelativePath + "/";
- }
-
- /** Closes the streams after completion */
- public void copyFile(InputStream in, OutputStream out) throws IOException
- {
- if (in == null || out == null)
- throw new IllegalArgumentException("Stream not initialized");
- try
- {
- byte[] buf = new byte[1024];
- int len;
- while ((len = in.read(buf)) > 0)
- {
- out.write(buf, 0, len);
- }
- } finally
- {
- in.close();
- out.close();
- }
- }
-
- /**
- * Utility method for deleting the contents of a given folder path
- *
- * @param folderPath
- * @return <code>true</code> if the process was completed successfully.
- * @throws IOException
- */
- public boolean deleteFolderAndContents(final String folderPath) throws IOException
- {
- final File path = new File(folderPath);
- return deleteFolderAndContents(path);
- }
-
- /**
- * Deletes the specified directory and all its contents including all sub directories.
- *
- * @param tempDir
- * the directory that is being deleted.
- */
- public boolean deleteFolderAndContents(File tempDir)
- {
- boolean status = true;
- if (tempDir != null)
- {
- File[] files = tempDir.listFiles();
-
- if (files != null)
- {
- for (int i = 0; i < files.length; i++)
- {
- if (files[i].isDirectory())
- {
- status = deleteFolderAndContents(files[i]) && status;
- } else
- {
- status = files[i].delete() && status;
- }
- }
- }
- status = tempDir.delete() && status;
- } else
- {
- status = false;
- }
- return status;
- }
-
- /**
- * Extracts the contents of the given input stream file to the given directory.
- *
- * @param istr
- * The input stream of the jar file
- * @param srcFileName
- * The name of the archive - where the contents of the input stream will be copied
- * @param destDir
- * The destination directory object
- * @return <code>true</code> if the process was completed successfully
- * @throws IOException
- */
- public boolean unzipArchiveToDir(final InputStream istr, final String srcFileName, final File destDir) throws IOException
- {
-
- if (!destDir.exists())
- throw new IOException("Directory does not exist");
- if (!destDir.canWrite())
- throw new IOException("Could not write to directory");
-
- final File sourceFile = new File(destDir, srcFileName);
-
- final FileOutputStream fos = new FileOutputStream(sourceFile);
- final BufferedOutputStream bufOutStream = new BufferedOutputStream(fos);
-
- try
- {
- Unzipper.INSTANCE.copyInputStream(istr, bufOutStream);
- } finally
- {
- bufOutStream.close();
- fos.close();
- }
-
- // check if the archive was copied successfully
- if (!sourceFile.exists())
- {
- throw new FileNotFoundException("Archive could not be found");
- }
-
- Unzipper.INSTANCE.unzip(sourceFile, destDir, false);
-
- return true;
- }
-
- /** Utility method for getting the contents of a file through URL */
- public String readURLResource(URL url) throws IOException
- {
- String readInf = null;
- final InputStream in = url.openStream();
-
- try
- {
- int inRead = in.read();
-
- readInf = "";
- while (inRead != -1)
- {
- readInf += String.valueOf((char) inRead);
- inRead = in.read();
- }
- } finally
- {
- in.close();
- }
-
- return readInf;
- }
-
- /**
- * Method for replacing the text occurrence in a file with the provided replacement.
- *
- * @param file
- * @param find
- * @param replacement
- * @return
- * @throws IOException
- */
- public boolean replaceContentsInFile(File file, String find, String replacement) throws IOException
- {
- if (!file.exists())
- return false;
-
- String fileContents = readFileContents(file);
-
- fileContents = fileContents.replaceAll(find, replacement);
-
- file.delete();
- file.createNewFile();
-
- writeContentsToFile(file, fileContents);
-
- return true;
- }
-
- /**
- * Writes the string to the given file.
- *
- * @param file -
- * the file to write to
- * @param fileContents -
- * the contents to be written to the file
- * @throws IOException
- * @throws FileNotFoundException
- */
- public void writeContentsToFile(File file, String fileContents) throws IOException, FileNotFoundException
- {
-
- PrintWriter pout = new PrintWriter(file);
-
- try
- {
- pout.println(fileContents);
- pout.flush();
- } finally
- {
- pout.close();
- }
- }
-
- /**
- * Reads the contents of a file and returns it as String.
- *
- * @param file -
- * the file to read from
- * @return the contents of the file
- * @throws IOException
- */
- public String readFileContents(File file) throws IOException
- {
- String readInf = null;
- final InputStream in = new FileInputStream(file);
-
- try
- {
- int inRead = in.read();
-
- readInf = "";
- while (inRead != -1)
- {
- readInf += String.valueOf((char) inRead);
- inRead = in.read();
- }
- } catch (IOException e)
- {
- throw e;
- } finally
- {
- in.close();
- }
-
- return readInf;
- }
-
- /** @return the resource input stream of the projects archive */
- @SuppressWarnings("unchecked")
- public InputStream getResourceInputStream(final String archiveName, final String projectSourceFolder, Class relativeResourceBaseClass)
- {
- return relativeResourceBaseClass.getResourceAsStream(projectSourceFolder + "/" + archiveName);
- }
-
- /** Method for handling the unzipping of the test projects */
- public void unzipTestProjects(final InputStream archiveStream, final String archiveName, final File destDir) throws IOException
- {
-
- if (archiveStream == null)
- throw new IOException("The archive resource stream is not initialized! archive: " + archiveName + " - dir: " + destDir);
-
- try
- {
- unzipArchiveToDir(archiveStream, archiveName, destDir);
- } finally
- {
- archiveStream.close();
- }
- }
-
- /**
- * Unzips the content of <tt>zipFileLocation</tt> into <tt>outFolder</tt>.
- *
- * @param zipFileLocation
- * @param outFolder
- * @throws IOException
- */
- public static void addZippedContent(File zipFileLocation, File outFolder) throws IOException
- {
- FileInputStream fis = new FileInputStream(zipFileLocation);
- addZippedContent(fis, outFolder);
- }
-
- /**
- * Unzips the content of <tt>is</tt> into <tt>outFolder</tt>.
- *
- * @param zipFileLocation
- * @param outFolder
- * @throws IOException
- */
- public static void addZippedContent(InputStream is, File outFolder) throws IOException
- {
- ZipInputStream zis = new ZipInputStream(is);
- ZipEntry entry = null;
- while ((entry = zis.getNextEntry()) != null)
- {
- File outFile = new File(outFolder, entry.getName());
-
- if (entry.isDirectory())
- {
- outFile.mkdirs();
- } else
- {
- OutputStream out = new FileOutputStream(outFile);
- byte[] buff = new byte[2048];
- int read;
- while ((read = zis.read(buff)) > 0)
- {
- out.write(buff, 0, read);
- }
- out.close();
- }
-
- zis.closeEntry();
- }
-
- zis.close();
- }
-
- /**
- * Deletes directory with its content
- *
- * @param dir
- */
- public static void deleteDirectory(File dir)
- {
- if (!dir.isDirectory())
- {
- throw new IllegalArgumentException("Not a directory" + dir.getName());
- }
-
- for (String s : dir.list())
- {
- File f = new File(dir.getAbsolutePath() + File.separator + s);
- if (f.isDirectory())
- {
- deleteDirectory(f);
- } else
- {
- f.delete();
- }
- }
-
- dir.delete();
- }
-
- /**
- * Create a directory named via the pattern System.getProperty("java.io.tmpdir") + File.separator + dirName
- *
- * @param dirName
- * @return
- */
- public static File createTempDirectory(String dirName)
- {
- File tempDir = new File(System.getProperty("java.io.tmpdir"), dirName);
- if (tempDir.exists())
- {
- deleteDirectory(tempDir);
- }
-
- if (!tempDir.mkdir())
- {
- throw new IllegalStateException("Temp direcory " + tempDir.getAbsolutePath() + " could not be created");
- }
- // tempDir.deleteOnExit();
-
- return tempDir;
- }
-
- /**
- * Copy the content of <code>filePath</code> and copies it to temporary file in system temp directory.
- *
- * @param classContext
- * @param filePath
- * @return created temporary file
- * @throws IOException
- */
- public static File copyToTempLocation(Class<?> classContext, String filePath) throws IOException
- {
- final InputStream is = classContext.getResourceAsStream(filePath);
- final File dir = new File(System.getProperty("java.io.tmpdir"));
- final File tempFile = new File(dir, System.currentTimeMillis() + ".java");
- tempFile.deleteOnExit();
-
- final FileOutputStream fos = new FileOutputStream(tempFile);
- try
- {
- byte[] buff = new byte[1024];
- for (int cnt = 0; (cnt = is.read(buff)) > -1;)
- {
- fos.write(buff, 0, cnt);
- }
- } finally
- {
- is.close();
- fos.close();
- }
-
- return tempFile;
- }
-
- public static void setFileContent(File file, String content) throws IOException
- {
- final FileWriter fw = new FileWriter(file);
- try
- {
- fw.write(content);
- } finally
- {
- fw.close();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/Unzipper.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/Unzipper.java
deleted file mode 100755
index d9bfdfb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/Unzipper.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.files;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/**
- * A simple utility for unzipping ZIP archives
- *
- * @author Danail Branekov
- */
-public class Unzipper {
- public static final Unzipper INSTANCE = new Unzipper();
-
- // Hide default constructor
- private Unzipper() {
-
- }
-
- /**
- * Copy the content from the <code>sourceStream</code> to the
- * <code>destinationStream</code>
- *
- * @param sourceStream
- * @param destStream
- * @throws IOException
- */
- public void copyInputStream(final InputStream sourceStream,
- final OutputStream destStream) throws IOException {
- byte[] buffer = new byte[1024];
- int len;
-
- while ((len = sourceStream.read(buffer)) >= 0) {
- destStream.write(buffer, 0, len);
- }
-
- destStream.flush();
- }
-
- /**
- * Unzip the zip file specified to the destination directory
- *
- * @param sourceFile
- * the source zip file
- * @param destinationDir
- * the destination directory
- * @param toLowerCase
- * if true, all the unzipped entries would be lowercased (for *IX
- * compatibility) The background behind this parameter is the
- * case inconsistency between ABAP xml test data directory names
- * and the real directory names in the ABAP ZIP
- * @throws IOException
- * @throws NullPointerException
- * when any of the input parameters is null
- * @throws IllegalArgumentException
- * when <code>sourceFile</code> does not exist or points to a
- * directory
- * @throws IllegalArgumentException
- * when <code>destinationDir</code> does not exist or is not a
- * directory
- */
- public void unzip(final File sourceFile, final File destinationDir,
- final boolean toLowerCase) throws IOException {
- checkInputParams(sourceFile, destinationDir);
- ZipFile zipFile = null;
-
- try {
- zipFile = new ZipFile(sourceFile);
- Enumeration<? extends ZipEntry> entries = zipFile.entries();
-
- // Create dir structure
- while (entries.hasMoreElements()) {
- final ZipEntry entry = entries.nextElement();
-
- if (entry.isDirectory()) {
- // This is not robust, just for demonstration purposes.
- (new File(destinationDir, toLowerCase ? entry.getName()
- .toLowerCase() : entry.getName())).mkdirs();
- }
- }
-
- // Create files
- entries = zipFile.entries();
- while (entries.hasMoreElements()) {
- final ZipEntry entry = entries.nextElement();
-
- if (entry.isDirectory()) {
- continue;
- }
-
- FileOutputStream fos = null;
- BufferedOutputStream bufOutStream = null;
-
- try {
- fos = new FileOutputStream(new File(destinationDir,
- toLowerCase ? entry.getName().toLowerCase() : entry
- .getName()));
- bufOutStream = new BufferedOutputStream(fos);
- copyInputStream(zipFile.getInputStream(entry), bufOutStream);
- fos.flush();
- bufOutStream.flush();
- } finally {
- if (fos != null) {
- fos.close();
- }
- if (bufOutStream != null) {
- bufOutStream.close();
- }
- }
- }
- } finally {
- if (zipFile != null) {
- zipFile.close();
- }
- }
- }
-
- private void checkInputParams(final File zipFile, final File destination) {
- // ContractChecker.nullCheckParam(zipFile, "zipFile");
- // ContractChecker.nullCheckParam(destination, "destination");
- if (!zipFile.exists() || zipFile.isDirectory()) {
- throw new IllegalArgumentException(
- "ZIP file does not exist or is a directory");
- }
- if (!destination.exists() || !destination.isDirectory()) {
- throw new IllegalArgumentException(
- "Destination does not exist or is not a directory");
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractDynamicMock.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractDynamicMock.java
deleted file mode 100755
index 15314b2..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractDynamicMock.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import org.jmock.core.InvocationDispatcher;
-
-/**
- * This class is equivalent to <c>org.jmock.core.AbstractDynamicMock</c>. The difference is that this class is parameterized. It extends from
- * <c>org.jmock.core.AbstractDynamicMock</c> and is thus backward compatible.
- *
- * @author Hristo Sabev
- *
- * @param <T>
- */
-public abstract class AbstractDynamicMock<T> extends org.jmock.core.AbstractDynamicMock
-{
-
- public AbstractDynamicMock(Class<T> mockedType, String name, InvocationDispatcher invocationDispatcher)
- {
- super(mockedType, name, invocationDispatcher);
- }
-
- public AbstractDynamicMock(Class<T> mockedType, String name)
- {
- super(mockedType, name);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Class<T> getMockedType()
- {
- return super.getMockedType();
- }
-
- @Override
- public abstract T proxy();
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractMockObjectTestCase.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractMockObjectTestCase.java
deleted file mode 100755
index 25c1367..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractMockObjectTestCase.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import java.util.Collection;
-
-import org.jmock.core.Constraint;
-import org.jmock.core.DynamicMock;
-import org.jmock.core.Formatting;
-import org.jmock.core.InvocationMatcher;
-import org.jmock.core.MockObjectSupportTestCase;
-import org.jmock.core.Stub;
-import org.jmock.core.matcher.InvokeAtLeastOnceMatcher;
-import org.jmock.core.matcher.InvokeAtMostOnceMatcher;
-import org.jmock.core.matcher.InvokeCountMatcher;
-import org.jmock.core.matcher.InvokeOnceMatcher;
-import org.jmock.core.matcher.TestFailureMatcher;
-import org.jmock.core.stub.ReturnIteratorStub;
-import org.jmock.core.stub.ReturnStub;
-import org.jmock.core.stub.ThrowStub;
-
-/**
- * An abstract class from which sub-classing test cases can inherit. This class is equivalent to org.jmock.MockObjectTestCase with the difference that
- * id does not provide an implementation to <c>newCoreMock</c> method and thus is not able to create any proxies. The other major difference is that
- * this class is parameterized. It should be used as a base class for sub-classes that provide strongly typed mocks. This class also take advantage of
- * some of the java 5 sugars. For example "varargs".
- *
- * @author Hristo Sabev
- *
- */
-public abstract class AbstractMockObjectTestCase extends MockObjectSupportTestCase
-{
-
- public AbstractMockObjectTestCase()
- {
- }
-
- public AbstractMockObjectTestCase(String name)
- {
- super(name);
- }
-
- /**
- * Creates a mock object that mocks the given type. The mock object is named after the type; the exact name is calculated by
- * {@link #defaultMockNameForType}.
- *
- * @param mockedType
- * The type to be mocked.
- * @return A {@link Mock} object that mocks <var>mockedType</var>.
- */
- @SuppressWarnings("unchecked")
- public <T> Mock<T> mock(Class mockedType)
- {
- return mock(mockedType, defaultMockNameForType(mockedType));
- }
-
- /**
- * Creates a mock object that mocks the given type and is explicitly given a name. The mock object is named after the type; the exact name is
- * calculated by {@link #defaultMockNameForType}.
- *
- * @param mockedType
- * The type to be mocked.
- * @param roleName
- * The name of the mock object
- * @return A {@link Mock} object that mocks <var>mockedType</var>.
- */
- @SuppressWarnings("unchecked")
- public <T> Mock<T> mock(Class mockedType, String roleName)
- {
- final Mock<T> newMock = new Mock<T>(newCoreMock(mockedType, roleName));
- registerToVerify(newMock);
- return newMock;
- }
-
- protected abstract <T> DynamicMock newCoreMock(Class<T> mockedType, String roleName);
-
- /**
- * Calculates
- *
- * @param mockedType
- * @return
- */
- public String defaultMockNameForType(Class<?> mockedType)
- {
- return "mock" + Formatting.classShortName(mockedType);
- }
-
- public Stub returnValue(Object o)
- {
- return new ReturnStub(o);
- }
-
- public Stub returnValue(boolean result)
- {
- return returnValue(new Boolean(result));
- }
-
- public Stub returnValue(byte result)
- {
- return returnValue(new Byte(result));
- }
-
- public Stub returnValue(char result)
- {
- return returnValue(new Character(result));
- }
-
- public Stub returnValue(short result)
- {
- return returnValue(new Short(result));
- }
-
- public Stub returnValue(int result)
- {
- return returnValue(new Integer(result));
- }
-
- public Stub returnValue(long result)
- {
- return returnValue(new Long(result));
- }
-
- public Stub returnValue(float result)
- {
- return returnValue(new Float(result));
- }
-
- public Stub returnValue(double result)
- {
- return returnValue(new Double(result));
- }
-
- public Stub returnIterator(Collection<?> collection)
- {
- return new ReturnIteratorStub(collection);
- }
-
- public Stub returnIterator(Object[] array)
- {
- return new ReturnIteratorStub(array);
- }
-
- public Stub throwException(Throwable throwable)
- {
- return new ThrowStub(throwable);
- }
-
- public InvocationMatcher once()
- {
- return new InvokeOnceMatcher();
- }
-
- public InvocationMatcher atLeastOnce()
- {
- return new InvokeAtLeastOnceMatcher();
- }
-
- public InvocationMatcher atMostOnce()
- {
- return new InvokeAtMostOnceMatcher();
- }
-
- public InvocationMatcher exactly(int expectedCount)
- {
- return new InvokeCountMatcher(expectedCount);
- }
-
- public InvocationMatcher never()
- {
- return new TestFailureMatcher("not expected");
- }
-
- public InvocationMatcher never(String errorMessage)
- {
- return new TestFailureMatcher("not expected (" + errorMessage + ")");
- }
-
- /**
- * @since 1.0.1
- */
- public Stub onConsecutiveCalls(Stub... stubs)
- {
- return onConsecutiveCalls(stubs);
- }
-
- /**
- * @since 1.1.0
- */
- public Stub doAll(Stub... stubs)
- {
- return doAll(stubs);
- }
-
- public Constraint collectionWithElements(final int expectedCollectionSize, final Object... objects)
- {
- return new Constraint(){
-
- public boolean eval(Object arg0)
- {
- final Collection<?> col = (Collection<?>)arg0;
- for(Object o : objects)
- {
- if(!col.contains(o))
- {
- return false;
- }
- }
-
- return objects.length == expectedCollectionSize;
- }
-
- public StringBuffer describeTo(StringBuffer arg0)
- {
- return arg0;
- }};
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/Mock.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/Mock.java
deleted file mode 100755
index 7c3b9a8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/Mock.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import org.jmock.core.DynamicMock;
-
-/**
- * This class is equivalent to <c>org.jmock.Mock</c> class from JMock. The only difference is that this a parameterized (generic) version. This makes
- * it a lot easier for use as no manual casts to the mocked type are required by the programmer. This class extends from <c>org.jmock.Mock</c> so its
- * fully backward compatible.
- *
- * @see org.jmock.Mock
- */
-public class Mock<T> extends org.jmock.Mock
-{
-
- /**
- * Constructs a new mock for the specified type. The new mock has the specified name. This name will be shown by all reports concerning this mock
- * instance. Such reports are unmached invocations and so on.
- *
- * @param mockedType -
- * the type to be mocked. This could be either class or interface.
- * @param name -
- * name of this mock
- */
- public Mock(Class<T> mockedType, String name)
- {
- super(mockedType, name);
- }
-
- /**
- * Constructs a new mock for the specified type.
- *
- * @param mockedType -
- * the type to be mocked. This class needs to be either class or interface.
- */
- public Mock(Class<T> mockedType)
- {
- super(mockedType);
- }
-
- /**
- * Constructs new Mock that wraps the supplied <c>DynamicMock</c> instance.
- *
- * @param arg0 -
- * the dynamic mock instance
- */
- public Mock(DynamicMock arg0)
- {
- super(arg0);
- }
-
- /**
- * Obtains the proxy instance for this mock.
- *
- * @return the proxy instance for this mock.
- */
- @Override
- @SuppressWarnings("unchecked")
- public T proxy()
- {
- return (T) super.proxy();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/MockObjectTestCase.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/MockObjectTestCase.java
deleted file mode 100755
index d126061..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/MockObjectTestCase.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.jaxws.testutils.jmock.testcases.BeforeAfterEnabler;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.testcases.IBeforeAfterEnabled;
-import org.jmock.core.CoreMock;
-import org.jmock.core.DynamicMock;
-import org.jmock.core.Verifiable;
-
-
-/**
- * An test case base class for mock objects test case. This one is roughly equivalent to org.jmock.cglib.MockObjectTestCase. There are several
- * important differences though. This test case class assumes that the loader of the test case class is able to load both the class being mocked and
- * the jmock classes. Thus test case class loader is used to create the mock type. This mock test case also provides two new <c>mock</c> methods.
- * These methods can instantiate a mock for a given class by executing the class's constructor. The methods <c></c> and <c></c> inherited from
- * <c>AbstractMockObjectTestCase</c> create mocks without executing the constructor of the mocked class. They use the SUN's reflection mechanism and
- * are able to create classes without a visible default constructor or without constructor at all. This functionallity however is platform specific.
- * It can be compiled and executed only on SUN VMs. Should the code be executed on another VM most likely a <c>NoClassDefFoundError</c> will ocurr.
- *
- * @author Hristo Sabev
- *
- */
-public abstract class MockObjectTestCase extends AbstractMockObjectTestCase implements IBeforeAfterEnabled
-{
- private final BeforeAfterEnabler bae = new BeforeAfterEnabler(this);
- public void afterTestCase() throws Exception
- {
- }
-
- public void beforeTestCase() throws Exception
- {
- }
-
- public void runBareInternal() throws Throwable
- {
- super.runBare();
- }
-
- @Override
- public void runBare() throws Throwable
- {
- bae.runBare();
- }
-
- private List<Mock<?>> mocksToVerify = new Vector<Mock<?>>();
-
- /**
- * Constructs a new <c>MockObjectTestCase</c> instance with no name
- *
- */
- public MockObjectTestCase()
- {
- }
-
- public List<Mock<?>> getMocksToVerify()
- {
- final List<Mock<?>> copy = new ArrayList<Mock<?>>();
- copy.addAll(mocksToVerify);
- return copy;
- }
-
- @Override
- public void unregisterToVerify(Verifiable arg0)
- {
- mocksToVerify.remove(arg0);
- super.unregisterToVerify(arg0);
- }
-
- @Override
- public void verify()
- {
- mocksToVerify.clear();
- super.verify();
- }
-
- /**
- * Constructs a new <c>MockObjectTestCase</c> instance with the specified name
- *
- * @param name -
- * the name of this test case.
- * @see junit.framework.TestCase
- */
- public MockObjectTestCase(String name)
- {
- super(name);
- }
-
- @Override
- protected <T> DynamicMock newCoreMock(Class<T> mockedType, String roleName)
- {
- return new CoreMock(mockedType, roleName);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/StubUtils.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/StubUtils.java
deleted file mode 100755
index 95ac877..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/StubUtils.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.jmock.core.Stub;
-import org.jmock.core.stub.ReturnStub;
-import org.jmock.core.stub.StubSequence;
-
-/**
- * Utils for creating more complex jmock stubs
- *
- * @author Hristo Sabev
- *
- */
-public class StubUtils
-{
-
- /**
- * Creates a stub that will return the proxy for the next mock in the supplied array on a consequtive call. I.e. the first call returns the proxy
- * at <c>returnValues[0]</c>, the second call will return the proxy for the mock at <c>returnValues[1]</c>, and so forth
- *
- * @param returnValues -
- * the mocks which will be returned on consequtive calls
- * @return - a stub that will return the proxies for the specified mocks on each consequtive call
- */
- public static Stub onConsequtiveCallsWillReturnMocks(Mock<?>[] returnValues)
- {
- final Stub[] returnStubs = new Stub[returnValues.length];
- for (int i = 0; i < returnValues.length; i++)
- {
- returnStubs[i] = new ReturnStub(returnValues[i].proxy());
- }
- return new StubSequence(returnStubs);
- }
-
- /**
- * Converts an array of mocks to an array of proxies for these mocks. All mocks should be mocks for one and the
- * same type.
- * @param <T> - the type of the mocked class
- * @param mocks - the array of mocks to be converted to proxies
- * @param proxies - an array of the type of the proxy. It will be used to store the proxies for the mocks
- * @throws IndexOutOfBoundsException - thrown if the arrays are with different sizes.
- */
- public static <T> void mocksToProxies(Mock<T>[] mocks, T[] proxies) {
- for (int i = 0; i < mocks.length; i++)
- {
- proxies[i] = mocks[i].proxy();
- }
- }
-
- /**
- * Creates a return stub that will return an array of mock proxies for the supplied array of mocks.
- * @param returnValues - an array of mocks, whose proxies has to be returned
- * @return - a stub wich will return an array of proxies in the same order as the passed mocks.
- * @throws IndexOutOfBoundsException - if the two arrays are with different lengths
- */
- public static <T>Stub returnArrayOfMocks(Mock<T>[] returnValues, T[] proxies)
- {
- mocksToProxies(returnValues, proxies);
- return new ReturnStub(proxies);
- }
-
- /**
- * Creates a stub that on consequtive calls will return the next boolean in the supplied array I.e. the first call returns the boolean at
- * <c>returnValues[0]</c>, the second call will return the boolean at <c>returnValues[1]</c>, and so forth
- *
- * @param returnValues -
- * the booleans which will be returned on consequtive calls
- * @return - a stub that will return the booleans for each consequtive call
- */
- public static Stub onConsecutiveCallsWillReturnBoolean(boolean[] returnValues)
- {
- final Stub[] returnStubs = new Stub[returnValues.length];
- for (int i = 0; i < returnValues.length; i++)
- {
- returnStubs[i] = new ReturnStub(returnValues[i]);
- }
- return new StubSequence(returnStubs);
- }
-
- public static <T> Stub returnCollectionContaining(T[] contained) {
- final Collection<T> coll = new ArrayList<T>();
- for(T o : contained) {
- coll.add(o);
- }
- return new ReturnStub(coll);
- }
-
- public static <T> Stub returnCollectionContaining(T contained) {
- final Collection<T> coll = new ArrayList<T>(1);
- coll.add(contained);
- return new ReturnStub(coll);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterEnabler.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterEnabler.java
deleted file mode 100755
index 49d1650..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterEnabler.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * This class is based on work by Shay Banon (http://www.kimchy.org/before_after_testcase_with_junit/)
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock.testcases;
-
-import java.lang.reflect.Method;
-import java.util.Vector;
-
-import junit.framework.Test;
-
-public class BeforeAfterEnabler {
-
- private final IBeforeAfterEnabled tc;
-
- private int testCount = 0;
-
- private final int totalTestCount;
-
- private boolean disableAfterTestCase = false;
-
- public BeforeAfterEnabler(IBeforeAfterEnabled tc) {
- this.tc = tc;
- totalTestCount = countTotalTests();
- }
-
- public void runBare() throws Throwable {
- Throwable exception = null;
- if (testCount == 0) {
- beforeTestCase();
- }
- testCount++;
- try {
- tc.runBareInternal();
- } catch (Throwable running) {
- exception = running;
- }
- if (testCount == totalTestCount) {
- if (!disableAfterTestCase) {
- try {
- afterTestCase();
- } catch (Exception afterTestCase) {
- if (exception == null) exception = afterTestCase;
- }
- } else {
- disableAfterTestCase = false;
- }
- }
- if (exception != null) throw exception;
- }
-
- public void disableAfterTestCase() {
- disableAfterTestCase = true;
- }
-
- /**
- * Called before any tests within this test case.
- *
- * @throws Exception
- */
- protected void beforeTestCase() throws Exception {
- tc.beforeTestCase();
- }
-
- /**
- * Called after all the tests within the test case
- * have executed.
- *
- * @throws Exception
- */
- protected void afterTestCase() throws Exception {
- tc.afterTestCase();
- }
-
- private int countTotalTests() {
- int count = 0;
- Class<?> superClass = tc.getClass();
- Vector<String> names = new Vector<String>();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- for (Method method : methods) {
- String name = method.getName();
- if (names.contains(name))
- continue;
- names.addElement(name);
- if (isTestMethod(method)) {
- count++;
- }
- }
- superClass = superClass.getSuperclass();
- }
- return count;
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class<?>[] parameters = m.getParameterTypes();
- Class<?> returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterTestCase.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterTestCase.java
deleted file mode 100755
index 9eaba7f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterTestCase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock.testcases;
-
-import junit.framework.TestCase;
-
-public abstract class BeforeAfterTestCase extends TestCase implements IBeforeAfterEnabled {
-
- private final BeforeAfterEnabler bfe = new BeforeAfterEnabler(this);
-
- public void runBareInternal() throws Throwable {
- super.runBare();
- }
-
- @Override
- public void runBare() throws Throwable {
- bfe.runBare();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/EqualsTestCase.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/EqualsTestCase.java
deleted file mode 100755
index 5ed0e24..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/EqualsTestCase.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock.testcases;
-
-import java.lang.reflect.Modifier;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-/**
- * An abstract test case for the <c>Object.equals(Object)</c> and <c>Object.hashCode()</c> methods. This test case performs the tests for <c>equals</c>
- * and <c>hashCode</c> simultaniesly as they are tightly connected. The tescase test the following properties of equals/hasCode:
- * <p>
- * 1. equals reflexivity 2. equals symetricity 3. equals transitivyte 4. hashCode statbility 5. hashCode immutability 6. equals is suitable for
- * subclasses
- * </p>
- *
- * The test cases is abstract and need to be sublcassed by concrete test case. Several abstract methods need to be implemented by concrete test cases.
- *
- * @author Hristo Sabev
- *
- * @param <T>
- */
-public abstract class EqualsTestCase<T> extends TestCase
-{
-
- private final Class<T> testClass;
-
- /**
- * Creates a new <c>EqualsTestCase</c> instance to test the equals method of the supplied class
- *
- * @param testClass -
- * the class whose equals method will be tested
- */
- public EqualsTestCase(Class<T> testClass)
- {
- this(null, testClass);
- }
-
- /**
- * Creates a new <c>EqualsTestCase</c> instance to test the equals method of the supplied class. This test case also takes a name paramter, which
- * i passed to <c>TestCase</c> super constructor. I.e. this is the name of the test case
- *
- * @param name -
- * name of the test case
- * @param testClass -
- * the class whose equals method will be tested
- */
- public EqualsTestCase(String name, Class<T> testClass)
- {
- assertNotNull("test class passed in constructor was null", testClass);
- this.testClass = testClass;
- }
-
- /**
- * Obtains a new iterator of instances for the tested class.
- *
- * @param iterations -
- * number of iterations i.e the number of times one can invoke <c>Iterator.next()</c> withouth getting <c>NoSuchElementException</c>
- * exception
- * @return a new iterator of instanced for the tested class;
- */
- abstract public Iterator<T> newObjectIterator(int iterations);
-
- /**
- * Obtains a new instance of the tested class. Each call to this method should return a new instance, which is considered equal to the instance
- * returned by the prefvious call but is not identical. For example if the tested class was <c>String</c> the most obvious implementation of this
- * method would be <c>
- * <p>
- * return new String("test string")
- * </p>
- * </c>
- *
- * @return a new instance of the test class assumed to be equal to the previously returned instances
- */
- abstract public T newEqualInstance();
-
- /**
- * Obtains a new instance of a single class, which is a subclass of the tested class. The subclass must not override the <c>equals</c> method of
- * the tested class. All instances should be equal. The returned instances should have the same values of all the inherited fields as the
- * instances retured by <c>newEqualInstance</c>
- *
- * @return returns a new instance of single sublcass of the tested class. Each call should return an instance equal to the previously returned but
- * not identical. Null if the tested class is final
- */
- abstract public T newAncestorEqualInstance();
-
- /**
- * Obtains a new instance of the the tested class. The single restriction on the returned instances is that they should not be equal to the
- * instances returned by <c>newEqualInstance</c>
- *
- * @return a new instance of the test class. The newly returned instance is not equal to the instances returned by <c>newEqualInstance</c>
- */
- abstract public T newNonEqualInstance();
-
- /**
- * Modifies a given instance of the tested class. The instance should be modified in such a way that it's not equal to the instances retured by
- * <c>newEqualInstance</c> ans <c>newNoneEqualInstance()</c>. If the tested class is immutable then the implementation of this method should be
- * empty
- *
- * @param instance -
- * the instance to be modified.
- */
- abstract public void modifyObjectInstance(T instance);
-
- /**
- * Obtains the number of comparisons that will be made for the reflexivity test. This method can be overriden by subclasses to specify a different
- * value. By default this number is 100.
- *
- * @return - the number of comparisons that will be made for the reflexivity test.
- */
- public int getIterationsForReflixivityTest()
- {
- return 100;
- }
-
- /**
- * Obatains the number of comparisons that will be made for the symitricity test. This method can be override by subclasses to specify a different
- * value. By default this number is 1000
- *
- * @return - the number of comparisons that will be made for the reflixivity test.
- */
- public int getIterationsForSymetricityTest()
- {
- return 1000;
- }
-
- /**
- * Obatains the number of comparisons that will be made for the transitivity test. This method can be override by subclasses to specify a
- * different value. By default this number is 2000
- *
- * @return - the number of comparisons that will be made for the transitivity test.
- */
- public int getIterationsForTransitivityTest()
- {
- return 2000;
- }
-
- /**
- * Tests that equals is reflexive. It enforces the rule a.equals(a) == true. This test also tests that hashCode function is stable(). I.e.
- * hashCode doesn't change it's value between several invocations, as well as that hashCode is immutable over object change. The test strategy is
- * to create an new object iterator and then for each returned instance:
- *
- * <ol>
- * <li>Compare it with itself</li>
- * <li>check that its hash code stays the same</li>
- * <li>modify the returned instance by calling <c>modifyInstance</c> and then check the hashCode again</li>
- * </ol>
- *
- */
- public void testEqulsReflexive()
- {
- final int iterationsForThisTest = getIterationsForReflixivityTest();
- final Iterator<T> objectTiterator = newObjectIterator(iterationsForThisTest);
- while (objectTiterator.hasNext())
- {
- final T objectT = objectTiterator.next();
- assertTrue("equals is not reflexive", objectT.equals(objectT));
- final int initialHashCode = objectT.hashCode();
- for (int i = 0; i < iterationsForThisTest; i++)
- {
- assertEquals("hashCode is not stable upon multiple calls", initialHashCode, objectT.hashCode());
- }
- modifyObjectInstance(objectT);
- assertEquals("hashCode is not stable upon modification of the object", initialHashCode, objectT.hashCode());
- }
- }
-
- /**
- * Tests that equals is symetric i.e. a.equals(b) <==> b.equals(a). This method also tests that hashCode behaves correctly in sense a.quals(b) =>
- * a.hashCode() == b.hashCode(). This test uses two object iterators. One for a and one for b, where a and b are from the above rule. Each of
- * these iterators are instantiated with the same number of elements. This method also checks that whenever two instances returned by the two
- * iterators are equal then their hascode is equal.
- *
- */
- public void testEqualsSymetric()
- {
- final int iterationsForThisTest = getIterationsForSymetricityTest();
- final Iterator<T> objectTIterator1 = newObjectIterator(iterationsForThisTest);
- final Iterator<T> objectTIterator2 = newObjectIterator(iterationsForThisTest);
- while (objectTIterator1.hasNext())
- {
- assertTrue("The two object iterators don't have equal number of objects", objectTIterator2.hasNext());
- final T objectT1 = objectTIterator1.next();
- final T objectT2 = objectTIterator2.next();
- if (objectT1.equals(objectT2))
- {
- assertTrue("Equals is not symetric", objectT2.equals(objectT1));
- assertTrue("Hashcode is not the same for equal instances", objectT1.hashCode() == objectT2.hashCode());
- } else if (objectT2.equals(objectT1))
- {
- fail("Equals is not symetric");
- }
- }
- }
-
- /**
- * Tests that equals is transitive i.e. a.equals(b) & b.equals(c) => a.equals(c). This test uses three object iterators. One for a, one for b, and
- * one for c, where a,b,c are from the above rule. Each of these iterators are instantiated with the same number of elements.
- */
- public void testEqualsTransitive()
- {
- final int iterationsForThisTest = getIterationsForTransitivityTest();
- final Iterator<T> objectTIterator1 = newObjectIterator(iterationsForThisTest);
- final Iterator<T> objectTIterator2 = newObjectIterator(iterationsForThisTest);
- final Iterator<T> objectTIterator3 = newObjectIterator(iterationsForThisTest);
-
- while (objectTIterator1.hasNext())
- {
- assertTrue("The three object iterators don't have equal number of objects", objectTIterator2.hasNext());
- assertTrue("The three object iterators don't have equal number of objects", objectTIterator3.hasNext());
- final T objectT1 = objectTIterator1.next();
- final T objectT2 = objectTIterator2.next();
- final T objectT3 = objectTIterator3.next();
-
- if (objectT1.equals(objectT2) && objectT1.equals(objectT3))
- {
- assertTrue("equals is not transitive", objectT2.equals(objectT3));
- }
- }
- }
-
- /**
- * Tests that <c>equal</c> returns false if <c>null</c> is passed as argument
- *
- */
- public void testEqualsReturnsFalseIfNullPassed()
- {
- final T objectT = this.newEqualInstanceCheckCorrect();
- assertFalse("equals returned true when null passed for other object", objectT.equals(null));
- }
-
- /**
- * Tests that <c>equal</c> returns false if a non-equal object is passed as an argument. The two non equal instances are created by calling
- * <c>newEqualInstance</c> and <c> newNonEqualInstance</c>
- *
- */
- public void testEqualsReturnsFalseOnNonEquals()
- {
- final T objectT1 = this.newEqualInstanceCheckCorrect();
- final T objectT2 = this.newNonEqualInstanceCheckCorrect();
- assertTrue("Equals reported true for instances assumed non equal.", !objectT1.equals(objectT2) && !objectT2.equals(objectT1));
- }
-
- /**
- * Tests that <c>equal</cL returns true if an equal object is passed as an argument. The instances that are compared are obtained by two
- * consecutive calls to <c>newEqualInstance</c>
- *
- */
- public void testEqualsReturnsTrueOnEquals()
- {
- final T objectT1 = this.newEqualInstanceCheckCorrect();
- final T objectT2 = this.newEqualInstanceCheckCorrect();
- assertTrue("Equals reported false for instances assumed equal.", objectT1.equals(objectT2) && objectT2.equals(objectT1));
- }
-
- /**
- * Tests that equals returns false if an object of another class is passed. In case that the tested class is not final this test passes a subclass
- * of the test class as an argument to <c>equals</c>. The passed ancestor object has the same value for all its field. This is intended to cahtch
- * wrong implementations using "instanceof" rather than <c>getClass() == other.getClass()</c>
- *
- */
- public void testEqualsReturnsFalseIfOtherClassPassed()
- {
- final T objectT = newEqualInstanceCheckCorrect();
- Object object = newAncestorEqualInstanceCheckCorrect();
- if (object == null)
- {
- // class is final. No ancestor could be created. Use some other class.
- object = new Object();
- }
- assertFalse("equals returned true when object of another type passed", objectT.equals(object));
- }
-
- /**
- * Tests that <c>equals</c> is properly implemented for use in subclasses. It takes two equal ancestor instances and compares them for equality.
- * Since the ancestor class does not override the equals method. The tests asserts that equals should return true.
- *
- */
- public void testEqualsSuitableForAncestors()
- {
- final T ancestorT1 = newAncestorEqualInstanceCheckCorrect();
- final T ancestorT2 = newAncestorEqualInstanceCheckCorrect();
- if (ancestorT1 == null)
- {
- assertNull(
- "The newAncestorInstance() method returned null on the second invocation, while it return a value differet than null from the first",
- ancestorT2);
- return;
- }
- assertTrue(ancestorT1.equals(ancestorT2) && ancestorT2.equals(ancestorT1));
-
- }
-
- private T newAncestorEqualInstanceCheckCorrect()
- {
- final T ancestorT = newAncestorEqualInstance();
- if (ancestorT == null)
- {
- assertTrue("newAncestorEqualInstance returned null, although the test class ", Modifier.isFinal(testClass.getModifiers()));
- } else
- {
- assertTrue("newAncestorEqualInstance returned object of class " + ancestorT.getClass() + ", which is not subtype of "
- + testClass.getName(), testClass.isAssignableFrom(ancestorT.getClass()));
- }
- return ancestorT;
- }
-
- private T newEqualInstanceCheckCorrect()
- {
- final T objectT = newEqualInstance();
- assertTrue("newEqualInstance returned object of class " + objectT.getClass().getName() + "Expected was class " + testClass.getName(),
- testClass == objectT.getClass());
- return objectT;
- }
-
- private T newNonEqualInstanceCheckCorrect()
- {
- final T objectT = newNonEqualInstance();
- assertTrue("newNonEqualInstance returned object of class " + objectT.getClass().getName() + "Expected was class " + testClass.getName(),
- testClass == objectT.getClass());
- return objectT;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/IBeforeAfterEnabled.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/IBeforeAfterEnabled.java
deleted file mode 100755
index 9115eed..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/IBeforeAfterEnabled.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock.testcases;
-
-public interface IBeforeAfterEnabled {
-
- public void beforeTestCase() throws Exception;
-
- public void afterTestCase() throws Exception;
-
- public void runBareInternal() throws Throwable;
-
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java
deleted file mode 100755
index d5e208a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jobs;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.testutils.threading.TestContext;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-public class JobUtils
-{
- @SuppressWarnings("deprecation")
- public static void waitForJobsInterruptable() throws InterruptedException
- {
- while (Platform.getJobManager().currentJob() != null)
- {
- delay(5);
- }
- }
-
- public static void waitForJobs() throws JavaModelException
- {
- waitForDummyJob(Job.INTERACTIVE);
-
- while (true)
- {
- try
- {
- waitForJobsInterruptable();
- break;
- } catch (InterruptedException ie)
- {
-
- }
- }
-
- // i036509 added couse waiting for jobs is not enought
- waitForIndexer();
-
- // Force notifications
- waitForNotifications();
- }
-
- public static void delay(final long millis) throws InterruptedException
- {
- Display display = Display.getCurrent();
- // if this is the UI thread, then process the input
- if (display != null)
- {
- final long entTimeMillis = System.currentTimeMillis() + millis;
- while (System.currentTimeMillis() < entTimeMillis)
- {
- if (!display.readAndDispatch())
- {
- display.sleep();
- }
- }
- display.update();
- } else
- {
- Thread.sleep(1000);
- }
- }
-
- public static void waitForIndexer() throws JavaModelException
- {
- new SearchEngine().searchAllTypeNames(null,SearchPattern.R_EXACT_MATCH, null,
- SearchPattern.R_CASE_SENSITIVE, IJavaSearchConstants.CLASS, SearchEngine
- .createJavaSearchScope(new IJavaElement[0]), new TypeNameRequestor()
- {
- @SuppressWarnings("unused")
- public void acceptClass(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames,
- String path)
- {
- }
- @SuppressWarnings("unused")
- public void acceptInterface(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames,
- String path)
- {
- }
- }, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
- }
-
- /**
- * Schedule a dummy job with the priority specified and wait for it is done
- */
- private static void waitForDummyJob(final int priority)
- {
- try
- {
- waitForDummyJobWithPrio(priority);
- }
- catch(InterruptedException e)
- {
-
- }
- }
-
- private static void waitForDummyJobWithPrio(final int prio) throws InterruptedException
- {
- Job myDummyJob = new Job("DUMMY"){
-
- @Override
- protected IStatus run(IProgressMonitor monitor)
- {
- return Status.OK_STATUS;
- }};
-
- myDummyJob.setPriority(prio);
- myDummyJob.setUser(false);
- myDummyJob.schedule();
-
- myDummyJob.join();
- }
-
-
- /**
- * Forces delivering of notification events. The implementation of the method is "inspired" by NotificationManager's notification job
- * @throws InterruptedException
- */
- private static void waitForNotifications()
- {
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IWorkspaceRunnable dummyRunnable = new IWorkspaceRunnable(){
- public void run(IProgressMonitor monitor) throws CoreException
- {
- }
- };
-
- final Job notifForcingJob = new Job("Delivering notifications..."){
-
- @Override
- protected IStatus run(IProgressMonitor monitor)
- {
- try
- {
- workspace.run(dummyRunnable, null, IWorkspace.AVOID_UPDATE, null);
- } catch (CoreException e)
- {
- logger().logDebug( e.getMessage(), e );
- }
- return Status.OK_STATUS;
- }};
-
- syncExecJob(notifForcingJob, PlatformUI.getWorkbench().getDisplay());
- }
-
- public static void waitForJobsSlow() throws JavaModelException
- {
- waitForJobs();
- waitForDummyJob(Job.DECORATE);
-
- waitForEventLoop();
- }
-
- private static void waitForEventLoop()
- {
- final Display display = PlatformUI.getWorkbench().getDisplay();
-
- final Runnable runnable = new Runnable(){
-
- public void run()
- {
- // Let the display process the events in its queue
- while(display.readAndDispatch()){};
- }};
-
- if(Display.getCurrent() != null)
- {
- runnable.run();
- }
- else
- {
- display.syncExec(runnable);
- }
-
- }
-
- /**
- * Executes synchronously (schedules and joins) the job specified.<br>
- * If the method is called from the UI thread, the job is scheduled and joined in a modal context thread thus letting the event loop process asynchronous events<br>
- * If the method is called from a worker thread, the job is scheduled and joined in the caller thread.
- *
- * @param job
- * @param display
- */
- private static void syncExecJob(final Job job, final Display display)
- {
- final IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
-
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- job.schedule();
- try
- {
- job.join();
- } catch (InterruptedException e)
- {
- logger().logDebug(e.getMessage(), e);
- }
- }
- };
- try
- {
- TestContext.run(runnable, Display.getCurrent() != null, new NullProgressMonitor(), display);
- } catch (InvocationTargetException e)
- {
- logger().logDebug(e.getMessage(), e);
- } catch (InterruptedException e)
- {
- logger().logDebug(e.getMessage(), e);
- }
- }
-
- private static ILogger logger()
- {
- return new Logger();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ClassLoadingTest.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ClassLoadingTest.java
deleted file mode 100755
index 1b64200..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ClassLoadingTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-/**
- * Extends {@link ProjectBasedTest} by adding finctionalities to create classes in some package eider by reading it from text file or passed as
- * strings.
- *
- * </pre>
- *
- * @author Georgi Vachkov
- */
-@SuppressWarnings("nls")
-public abstract class ClassLoadingTest extends ProjectBasedTest
-{
- private final static String JAVA_EXT = ".java";
-
- private final static char SEPARATOR = '#';
-
- protected IPackageFragment defaultPackage;
-
- public void createJavaProject(String srcFolder, String defaultPackageName) throws CoreException
- {
- createJavaProject(srcFolder);
-
- if (defaultPackageName != null)
- {
- defaultPackage = getSourceFolder().createPackageFragment(defaultPackageName, true, null);
- }
- }
-
- /**
- * Creates class in test project. <code>sourceFilePath</code> must contain the class source without package declaration. The class is created in
- * default package.
- *
- * Project must be created before this method is called.
- *
- * @param sourceFilePath
- * @param className
- * @return IType object for the created class
- * @throws IOException
- * @throws JavaModelException
- */
- protected IType createClass(String sourceFilePath, String className) throws IOException, CoreException
- {
- if (sourceFilePath == null)
- {
- throw new NullPointerException("sourceFilePath should not be null.");
- }
-
- String source = TestProjectsUtils.readSource(this.getClass(), sourceFilePath);
-
- return createClass(defaultPackage, className, source);
- }
-
- /**
- * Creates class in <code>pck</code> package with name and source <code>className, source</code>. Source must not incluse package
- * declaration. Project must be created before this method is called.
- *
- * @param pck
- * @param className
- * @param source
- * @return
- * @throws NullPointerException
- * in case some of the params is null.
- * @throws JavaModelException
- */
- protected IType createClass(IPackageFragment pck, String className, String source) throws CoreException
- {
- if (className == null)
- {
- throw new NullPointerException("param 'className' should not be null.");
- }
-
- if (source == null)
- {
- throw new NullPointerException("param 'source' should not be null.");
- }
-
- if (getTestProject() == null)
- {
- throw new NullPointerException("project must be created before classes can be added to it");
- }
-
- return getTestProject().createType(pck, className + JAVA_EXT, source);
- }
-
- /**
- * Reads the content of <code>sourcesFilePath</code> and creates classes in test project. The content of <code>sourcesFilePath</code> sould be -
- * '#' char (separator for classes) followed by Class name, new line and after that class source without package declaration.<br>
- * Example:
- *
- * <pre>
- * #ImplementsRemote
- * public class ImplementsRemote implements java.rmi.Remote
- * {
- * }
- *
- * #NoDefaultConstructor
- * public class NoDefaultConstructor implements java.io.Serializable
- * {
- * public NoDefaultConstructor(String param) {
- * }
- * }
- * </pre>
- *
- * This method is useful if lots of small classes should be created from a source file. Project must be created before this method is called.
- *
- * @param sourcesFilePath
- * @return map of className->IType. that have been created
- * @throws Exception
- */
- protected Map<String, IType> createClasses(String sourcesFilePath) throws Exception
- {
- Map<String, IType> types = new HashMap<String, IType>();
- String source = TestProjectsUtils.readSource(this.getClass(), sourcesFilePath);
-
- int startPos = 0;
- while ((startPos = source.indexOf(SEPARATOR)) > -1)
- {
- int endPos = source.indexOf(SEPARATOR, startPos + 1);
- if (endPos == -1)
- endPos = source.length();
-
- String src = source.substring(startPos + 1, endPos);
- source = source.substring(endPos);
-
- String className = src.substring(0, src.indexOf('\n')).replaceAll("\r", "");
- src = src.substring(src.indexOf('\n') + 1);
-
- types.put(className, createClass(defaultPackage, className, src));
- }
-
- return types;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ProjectBasedTest.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ProjectBasedTest.java
deleted file mode 100755
index 44e0898..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ProjectBasedTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-/**
- * General class for tests that should be started as JUnit Plugin tests. Provides basic functionalities for functional testing: 1. Create Java project
- * in junit-runtime-workbench. 2. Create default source folder. 3. Create default package.
- *
- * @author Georgi Vachkov
- */
-public abstract class ProjectBasedTest extends TestCase
-{
- private TestProject project;
-
- /**
- * <code>srcFolderName</code> the source folder where classes will be created, <code>packageName</code> is the package where classes will be
- * created.
- *
- * @param srcFolderName
- * @throws CoreException
- * @throws NullPointerException -
- * in case srcFolderName is null
- */
- protected void createJavaProject(String srcFolderName) throws CoreException
- {
- if (srcFolderName == null)
- {
- throw new NullPointerException("srcFolderName should not be null.");
- }
-
- project = new TestProject();
- project.createSourceFolder(srcFolderName);
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- if (project != null)
- {
- project.dispose();
- }
- }
-
- protected final TestProject getTestProject()
- {
- return project;
- }
-
- protected IPackageFragmentRoot getSourceFolder()
- {
- return project.getSourceFolder();
- }
-
- protected String getProjectName()
- {
- return project.getProject().getName();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestEjb3Project.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestEjb3Project.java
deleted file mode 100755
index a0a79b5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestEjb3Project.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.exception.MissingResourceException;
-
-public class TestEjb3Project
-{
- private IProject ejbProject;
-
- public TestEjb3Project(final String name) throws Exception
- {
- ejbProject = createEjbModule(name + "_" + Long.toString(System.currentTimeMillis()));
- }
-
- public TestEjb3Project(final String name, final boolean appendUid, final boolean reuseExisting) throws Exception
- {
- final StringBuilder projectName = new StringBuilder(name);
- if (appendUid)
- {
- projectName.append("_");
- projectName.append(Long.toString(System.currentTimeMillis()));
- }
- IProject existingProject = null;
- if (reuseExisting)
- {
- existingProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName.toString());
- }
- if (existingProject == null)
- {
- this.ejbProject = createEjbModule(projectName.toString());
- } else
- {
- this.ejbProject = existingProject;
- }
- }
-
- private IProject createEjbModule(final String name) throws Exception {
- return TestProjectsUtils.createEjb3Project(name);
- }
-
- public IProject getProject()
- {
- return ejbProject.getProject();
- }
-
- public IFolder getMetaInfFolder() throws MissingResourceException
- {
- return ejbProject.getProject().getFolder("ejbModule").getFolder("META-INF");
- }
-
- public IPackageFragment createPackage(String sourceFolder, String packageName) throws JavaModelException
- {
- final IJavaProject javaProject = JavaCore.create(getProject());
- final IFolder folder = getProject().getFolder(sourceFolder);
- final IPackageFragmentRoot srcFolder = javaProject.getPackageFragmentRoot(folder);
- return srcFolder.createPackageFragment(packageName, false, new NullProgressMonitor());
- }
-
- public IFile createFile(final IFolder folder, final String fileName, final URL inputUrl) throws IOException, CoreException
- {
- ContractChecker.nullCheckParam(folder, "folder");
- ContractChecker.nullCheckParam(fileName, "fileName");
- ContractChecker.nullCheckParam(inputUrl, "inputUrl");
-
- final IFile file = folder.getFile(fileName);
- final InputStream inputStream = inputUrl.openStream();
- try
- {
- file.create(inputStream, false, new NullProgressMonitor());
- return file;
- }
- finally
- {
- inputStream.close();
- }
- }
-
- /** To get a handle to a file located in this project specified by the relative file path.
- * @param filePath file path relative inside of the project, i.e. the project name must NOT
- * be part of the path
- * @return the file handle */
- public final IFile getFile(final String filePath)
- {
- ContractChecker.nullCheckParam(filePath, "filePath");
- return this.ejbProject.getProject().getFile(filePath);
- }
-
- public final void deleteFile(final IFolder folder, final String fileName) throws CoreException, IOException
- {
- ContractChecker.nullCheckParam(folder, "folder");
- ContractChecker.nullCheckParam(fileName, "fileName");
-
- final IFile file = folder.getFile(fileName);
- if (file.exists())
- {
- file.delete(true, new NullProgressMonitor());
- }
- }
-
- /** To create a project folder specified by the relative folder path. All folder segments
- * have already to exist apart from the last one, i.e. parent folders are not created automatically.
- * @param folderPath folder path relative inside of the project, i.e. the project name must NOT
- * be part of the path
- * @return the created folder
- * @throws CoreException */
- public final IFolder createFolder(final String folderPath) throws CoreException
- {
- ContractChecker.nullCheckParam(folderPath, "folderPath");
-
- final IFolder folder = this.ejbProject.getProject().getFolder(folderPath);
- folder.create(true, true, null);
- return folder;
- }
-
- /** To get a handle to a project folder specified by the relative folder path.
- * @param folderPath folder path relative inside of the project, i.e. the project name must NOT
- * be part of the path
- * @return the folder handle */
- public final IFolder getFolder(final String folderPath)
- {
- ContractChecker.nullCheckParam(folderPath, "folderPath");
- return this.ejbProject.getProject().getFolder(folderPath);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProject.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProject.java
deleted file mode 100755
index 8300d15..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProject.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.internal.resources.ResourceException;
-import org.eclipse.core.internal.resources.WorkspaceRoot;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-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.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.jaxws.testutils.jobs.JobUtils;
-import org.eclipse.jst.ws.jaxws.testutils.threading.TestContext;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.osgi.framework.Bundle;
-
-/**
- * Wrapper utility for maintaining projects which participate in tests fixture. Resource modification operations are always performed outside the UI (main thread). If the caller thread is the UI thread, fork in {@link TestContext} is performed.
- * Resource change operations are performed within a {@link IWorkspaceRunnable} with a scheduling rule of the workspace root<br>
- * Executing resource changes outside the UI thread allows resource change events propagation event when the JUnit tests run in the UI thread. This is especially important for Web service DOM tests as the model is updated on resource changes
- *
- * @author Georgi Vachkov, Danail Branekov
- */
-@SuppressWarnings("restriction")
-public class TestProject
-{
- public final static char CLASS_SEPARATOR = '#';
-
- private int idInMillis = 0;
-
- private IProject project;
-
- private IJavaProject javaProject;
-
- private IPackageFragmentRoot sourceFolder;
-
- public TestProject() throws CoreException
- {
- this("");
- }
-
- public TestProject(String name) throws CoreException
- {
- /*
- * Calculate the name of the test project. The formula: JavaProj_ + <current_time_in_millis? + <idInMillis> is ussed. In this formula
- * JavaProj_ is a string litteral, current_time_in_millis is obvious. idInMillis is an integer incremented each time a project name is
- * calculated. This is necessary because the system timer has precision about 10 ms. Thus it's possible that two consecutive project creations
- * give the same project name. For example the project is creted then the test executes very fast and a new project is created again. In the
- * same time simply the id is not enough as a different test run might produce the same project name. Thus the combination tim_millis +
- * idInMillis gives a unique project name
- */
- final String testProjectName = "JavaProj_" + Long.toString(System.currentTimeMillis()) + "_" + idInMillis++ + name;
- project = workspace().getRoot().getProject(testProjectName);
-
- final IWorkspaceRunnable createProjectOperation = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- project.create(null);
- project.open(null);
-
- configureJavaProject();
- }
- };
-
- TestProjectsUtils.executeWorkspaceRunnable(createProjectOperation);
- }
-
- private void configureJavaProject() throws CoreException
- {
- javaProject = JavaCore.create(project);
-
- IFolder binFolder = createBinFolder();
-
- setJavaNature();
- javaProject.setRawClasspath(new IClasspathEntry[0], null);
-
- createOutputFolder(binFolder);
- addSystemLibraries();
- }
-
- public TestProject(final IProject project) throws CoreException
- {
- if (project == null)
- {
- throw new NullPointerException("project should not be null");
- }
-
- this.project = project;
- this.javaProject = JavaCore.create(project);
- this.sourceFolder = findSourceFolder();
- }
-
- private IPackageFragmentRoot findSourceFolder() throws JavaModelException
- {
- for (IPackageFragmentRoot pfr : javaProject.getAllPackageFragmentRoots())
- {
- if (pfr.getKind() == IPackageFragmentRoot.K_SOURCE)
- {
- return pfr;
- }
- }
-
- return null;
- }
-
- public IProject getProject()
- {
- return project;
- }
-
- public IJavaProject getJavaProject()
- {
- return javaProject;
- }
-
- public void addJar(String plugin, String jar) throws MalformedURLException, IOException, CoreException
- {
- Path result = findFileInPlugin(plugin, jar);
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- final IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaCore.newLibraryEntry(result, null, null);
-
- setClasspath(newEntries);
- }
-
- public IPackageFragment createPackage(final String name) throws CoreException
- {
- final IPackageFragment[] createdPackage = new IPackageFragment[1];
-
- final IWorkspaceRunnable createPackageRunnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- if (sourceFolder == null)
- sourceFolder = createSourceFolder("src");
- createdPackage[0] = sourceFolder.createPackageFragment(name, false, null);
- }
- };
- TestProjectsUtils.executeWorkspaceRunnable(createPackageRunnable);
-
- return createdPackage[0];
- }
-
- public IType createType(final IPackageFragment pack, final String cuName, final String source) throws CoreException
- {
- final StringBuffer buf = new StringBuffer();
- buf.append("package " + pack.getElementName() + ";\n");
- buf.append("\n");
- buf.append(source);
-
- final ICompilationUnit[] createdCu = new ICompilationUnit[1];
- final IWorkspaceRunnable createCuRunnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- createdCu[0] = pack.createCompilationUnit(cuName, buf.toString(), false, null);
- }
- };
- TestProjectsUtils.executeWorkspaceRunnable(createCuRunnable);
-
- return createdCu[0].getTypes()[0];
- }
-
-
- /**
- * Creates multiple classes in project. The content of <code>source</code> should be in form -
- * '#' char (separator for classes) followed by Class name, new line and after that class source without package declaration.<br>
- * Example:
- *
- * <pre>
- * #ImplementsRemote
- * public class ImplementsRemote implements java.rmi.Remote
- * {
- * }
- *
- * #NoDefaultConstructor
- * public class NoDefaultConstructor implements java.io.Serializable
- * {
- * public NoDefaultConstructor(String param) {
- * }
- * }
- * </pre>
- *
- * This method is useful if lots of small classes should be created from a source file.
- *
- * @param sourcesFilePath
- * @return map of className->IType. that have been created
- * @throws Exception
- */
- public Map<String, IType> createTypes(IPackageFragment pack, String source) throws Exception
- {
- Map<String, IType> types = new HashMap<String, IType>();
- int startPos = 0;
- while ((startPos = source.indexOf(CLASS_SEPARATOR)) > -1)
- {
- int endPos = source.indexOf(CLASS_SEPARATOR, startPos + 1);
- if (endPos == -1) {
- endPos = source.length();
- }
-
- String src = source.substring(startPos + 1, endPos);
- source = source.substring(endPos);
-
- String className = src.substring(0, src.indexOf('\n')).replaceAll("\r", "").trim();
- src = src.substring(src.indexOf('\n') + 1);
-
- types.put(className, createType(pack, className + ".java", src));
- }
-
- return types;
- }
-
- public void dispose() throws CoreException
- {
- JobUtils.waitForJobs();
-
- final IWorkspaceRunnable disposeProjectRunnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- project.delete(true, true, null);
- } catch (ResourceException re) {
- /*
- * silently swallow the resource exception. For some reason this exception gets thrown
- * from time to time and reports the test failing. The project deletion itself happens
- * after the test has completed and a failure will not report a problem in the test.
- * Only ResourceException is caught in order not to hide unexpected errors.
- */
- return;
- }
- }
- };
- TestProjectsUtils.executeWorkspaceRunnable(disposeProjectRunnable);
- }
-
- public void close() throws CoreException
- {
- JobUtils.waitForJobs();
-
- final IWorkspaceRunnable closeRunnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- project.close(monitor);
- }
- };
- TestProjectsUtils.executeWorkspaceRunnable(closeRunnable);
- }
-
- private IFolder createBinFolder() throws CoreException
- {
- IFolder binFolder = project.getFolder("bin");
- binFolder.create(false, true, null);
- return binFolder;
- }
-
- private void setJavaNature() throws CoreException
- {
- IProjectDescription description = project.getDescription();
- description.setNatureIds(new String[] { JavaCore.NATURE_ID });
- project.setDescription(description, null);
- }
-
- private void createOutputFolder(IFolder binFolder) throws JavaModelException
- {
- IPath outputLocation = binFolder.getFullPath();
- javaProject.setOutputLocation(outputLocation, null);
- }
-
- public IPackageFragmentRoot createSourceFolder(final String name) throws CoreException
- {
- final IPackageFragmentRoot[] createdRoot = new IPackageFragmentRoot[1];
- final IWorkspaceRunnable createRootRunnable = new IWorkspaceRunnable()
- {
-
- public void run(IProgressMonitor monitor) throws CoreException
- {
- IFolder folder = project.getFolder(name);
- folder.create(false, true, null);
- createdRoot[0] = javaProject.getPackageFragmentRoot(folder);
-
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaCore.newSourceEntry(createdRoot[0].getPath());
- setClasspath(newEntries);
- }
- };
- TestProjectsUtils.executeWorkspaceRunnable(createRootRunnable);
- this.sourceFolder = createdRoot[0];
-
- return sourceFolder;
- }
-
- private void addSystemLibraries() throws CoreException
- {
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaRuntime.getDefaultJREContainerEntry();
- setClasspath(newEntries);
- }
-
- private Path findFileInPlugin(String plugin, String file) throws MalformedURLException, IOException
- {
- Bundle pluginBundle = Platform.getBundle(plugin);
- URL jarURL = new URL(pluginBundle.getEntry("/"), file);
- URL localJarURL = FileLocator.toFileURL(jarURL);
- return new Path(localJarURL.getPath());
- }
-
- public IPackageFragmentRoot getSourceFolder()
- {
- return sourceFolder;
- }
-
- /**
- *
- * @return the container corresponding to the package fragment root, i.e. the source folder.<br>
- * If this project is a jar/zip (if this is possible at all), the method will return null.
- */
- public IContainer getSourceFolderContainer()
- {
- try{
- IResource res = getSourceFolder().getCorrespondingResource();
- if(res==null) {
- return null;
- }else {
- IContainer retVal = (IContainer) res;
- return retVal;
- }
- }catch(JavaModelException ex) {
- return null;
- }catch(ClassCastException ex) {
- return null;
- }
- }
-
- public IFolder createFolder(final String folderName) throws CoreException
- {
- ContractChecker.nullCheckParam(folderName, "folderName");
- final IFolder folder = this.project.getFolder(folderName);
- final IWorkspaceRunnable createFolderRunnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- folder.create(false, true, monitor);
- }
- };
- TestProjectsUtils.executeWorkspaceRunnable(createFolderRunnable);
-
- return folder;
- }
-
- /**
- * Set the project root as source folder
- * @throws JavaModelException
- */
- public void assignProjectRootAsSourceFolder() throws CoreException
- {
- IClasspathEntry defaultSrcFolderEntry = JavaCore.newSourceEntry(project.getFullPath());
- IClasspathEntry[] oldCp = javaProject.getRawClasspath();
- IClasspathEntry[] newCp = new IClasspathEntry[oldCp.length + 1];
- System.arraycopy(oldCp, 0, newCp, 0, oldCp.length);
- newCp[newCp.length - 1] = defaultSrcFolderEntry;
-
- setClasspath(newCp);
- this.sourceFolder = TestProjectsUtils.getSourceFolder(project, "");
- }
-
- private IWorkspace workspace()
- {
- return ResourcesPlugin.getWorkspace();
- }
-
- public void setClasspath(final IClasspathEntry[] newClasspath) throws CoreException
- {
- final IWorkspaceRunnable setClasspathRunnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- javaProject.setRawClasspath(newClasspath, monitor);
- }
- };
- TestProjectsUtils.executeWorkspaceRunnable(setClasspathRunnable);
-
- String log = "\n"+javaProject.getProject().getName()+"\n"+String.valueOf(javaProject.getRawClasspath().length)+"\n";
-
- for(int ii=0; ii < javaProject.getRawClasspath().length; ii++)
- {
- log = log + javaProject.getRawClasspath()[ii].getPath().toString()+"\n";
- }
-
- if(javaProject.getRawClasspath().length==0)
- {
- log = log + "Classpath not initialized !\n";
- }
-
- ResourcesPlugin.getPlugin().getLog().log(new Status(0,"testOutput",log));
- }
-
- public void setAptProcessingEnabled(final boolean enabled, final boolean enableReconcile) throws CoreException
- {
- final IWorkspaceRunnable setProcessingRunnable = new IWorkspaceRunnable()
- {
-
- public void run(IProgressMonitor monitor) throws CoreException
- {
- AptConfig.setEnabled(TestProject.this.javaProject, enabled);
- AptConfig.setProcessDuringReconcile(TestProject.this.javaProject, enableReconcile);
- TestProject.this.javaProject.getProject().build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);
- }
- };
-
- TestProjectsUtils.executeWorkspaceRunnable(setProcessingRunnable);
- }
-
- /**
- * Builds a project
- * @param kind build kind. See {@link IProject#build(int, IProgressMonitor)} for details
- * @throws CoreException
- */
- public void build(final int kind) throws CoreException
- {
- final IWorkspaceRunnable buildRunnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- TestProject.this.project.build(kind, monitor);
- }
- };
-
- TestProjectsUtils.executeWorkspaceRunnable(buildRunnable);
- }
-
- public void refresh() throws CoreException
- {
- final IWorkspaceRunnable refreshRunnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- TestProject.this.getProject().refreshLocal(IResource.DEPTH_INFINITE, monitor);
- }
- };
-
- TestProjectsUtils.executeWorkspaceRunnable(refreshRunnable);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProjectsUtils.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProjectsUtils.java
deleted file mode 100755
index cf24479..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProjectsUtils.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-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.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.testutils.jobs.JobUtils;
-import org.eclipse.jst.ws.jaxws.testutils.threading.TestContext;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class TestProjectsUtils
-{
- /**
- * Reads content of text file and returns it as String.
- *
- * @param class context
- * @param name
- * @return
- * @throws IOException
- */
- public static String readSource(Class<?> classContext, String filePath) throws IOException
- {
- InputStreamReader isr = new InputStreamReader(classContext.getResourceAsStream(filePath));
- try
- {
- StringBuffer sb = new StringBuffer();
- char[] buff = new char[512];
-
- int len = 0;
- while ((len = isr.read(buff)) > 0)
- {
- sb.append(String.valueOf(buff, 0, len));
- }
-
- return sb.toString();
-
- } finally
- {
- isr.close();
- }
- }
-
- /**
- * Starts an indexer job. This method is useful to make sure that all workbench refresh/build processes are over
- * @throws JavaModelException
- */
- public static void waitForIndexer() throws JavaModelException
- {
- new SearchEngine().searchAllTypeNames(null, SearchPattern.R_EXACT_MATCH,
- null, SearchPattern.R_CASE_SENSITIVE,
- IJavaSearchConstants.CLASS,
- SearchEngine.createJavaSearchScope(new IJavaElement[0]), new TypeNameRequestor()
- {
- @SuppressWarnings("unused")
- public void acceptClass(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames,
- String path)
- {
- }
- @SuppressWarnings("unused")
- public void acceptInterface(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames,
- String path)
- {
- }
- },
- IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
- }
-
-
- public static IProject createJavaProject(String projectName) throws CoreException
- {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- project.create(null);
- project.open(null);
- JobUtils.waitForIndexer();
-
- IProjectDescription description = project.getDescription();
- description.setNatureIds(new String[] { JavaCore.NATURE_ID });
- project.setDescription(description, null);
- IJavaProject javaP = JavaCore.create(project);
- addToClasspath(javaP, JavaRuntime.getDefaultJREContainerEntry());
-
- return project;
- }
-
- private static void addToClasspath(final IJavaProject javaProject, final IClasspathEntry cpEntry) throws JavaModelException
- {
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = cpEntry;
- javaProject.setRawClasspath(newEntries, null);
- }
-
- public static IPackageFragmentRoot getSourceFolder(IProject project, String folderName) throws JavaModelException
- {
- IJavaProject javaProject = JavaCore.create(project);
- for(IPackageFragmentRoot root : javaProject.getPackageFragmentRoots())
- {
- if(root.getElementName().equals(folderName))
- {
- return root;
- }
- }
-
- return null;
- }
-
- public static IPackageFragmentRoot createSourceFolder(IProject project, String folderName) throws CoreException
- {
- if(getSourceFolder(project, folderName) != null)
- {
- throw new IllegalStateException("Source folder already exists: " + folderName);
- }
-
- IFolder srcFolder = project.getFolder(folderName);
- srcFolder.create(true, true, null);
-
- IJavaProject javaProject = JavaCore.create(project);
- IClasspathEntry srcCpEntry = JavaCore.newSourceEntry(srcFolder.getFullPath().makeAbsolute());
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[newEntries.length - 1] = srcCpEntry;
- javaProject.setRawClasspath(newEntries, null);
-
- return getSourceFolder(project, folderName);
- }
-
- /**
- * Imports a file into a project
- * @param classContext the class which classloader is used to get the source resource
- * @param relativeSrcFileLocation source file location relative to the <code>classContext</code> parameter
- * @param targetResource the target resource;
- * @param targetFileName the name of the file to be created
- * @throws IOException
- * @returns the file imported
- */
- public static File importFileIntoProject(Class<?> classContext, String relativeSrcFileLocation, IContainer targetResource, String targetFileName) throws IOException
- {
- String src = TestProjectsUtils.readSource(classContext, relativeSrcFileLocation);
- File f = new File(targetResource.getLocation().toOSString() + "\\" + targetFileName);
-
- if(f.exists())
- {
- throw new IllegalStateException("File already exists: " + f.getAbsolutePath());
- }
-
- if(f.isDirectory())
- {
- throw new IllegalStateException(f.getAbsolutePath() + " is a directory");
- }
- if( f.createNewFile() )
- {
- BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f)));
- out.write(src);
- out.flush();
- out.close();
- }
-
- return f;
- }
-
- public static void deleteWorkspaceProjects() throws JavaModelException
- {
- final IProgressMonitor monitor = new NullProgressMonitor();
- JobUtils.waitForJobs();
- for(IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects())
- {
- try
- {
- project.delete(false, monitor);
- } catch (CoreException e)
- {
- (new Logger()).logError(e.getMessage());
- }
- JobUtils.waitForJobs();
- }
- }
-
- public static IProject createEjb3Project(final String projectName) throws CoreException
- {
- final IProject ejbProject = createProjectWithFacet(projectName, new String[]{"jst.java", "jst.ejb"}, new String[]{"5.0", "3.0"});
- final IJavaProject javaP = JavaCore.create(ejbProject);
-
- removeAllSourceFolders(javaP);
-
- // Set ejbModule folder (created during jst.ejb facet installation) as source folder
- final IFolder srcFolder = ejbProject.getFolder("ejbModule");
- final IClasspathEntry ejbModuleCpEntry = JavaCore.newSourceEntry(srcFolder.getFullPath().makeAbsolute());
- addToClasspath(JavaCore.create(ejbProject), ejbModuleCpEntry);
-
- return ejbProject;
- }
-
- private static void removeAllSourceFolders(final IJavaProject javaP) throws JavaModelException
- {
- final List<IClasspathEntry> newClasspath = new ArrayList<IClasspathEntry>();
- for(IClasspathEntry cpEntry : javaP.getRawClasspath())
- {
- if(cpEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE)
- {
- continue;
- }
- newClasspath.add(cpEntry);
- }
- javaP.setRawClasspath(newClasspath.toArray(new IClasspathEntry[newClasspath.size()]), new NullProgressMonitor());
- }
-
- private static IProject createProjectWithFacet(final String projectName, final String[] facetId, final String[] facetVersion) throws CoreException
- {
- assert facetId.length == facetVersion.length;
- final IProject[] result = new IProject[1];
- try
- {
- TestContext.run(new IRunnableWithProgress(){
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- result[0] = createJavaProject(projectName);
- final IFacetedProject facetedProject = ProjectFacetsManager.create(result[0], true, new NullProgressMonitor());
-
- for(int i = 0; i < facetId.length; i++)
- {
- final IProjectFacet facet = ProjectFacetsManager.getProjectFacet(facetId[i]);
- facetedProject.installProjectFacet(facet.getVersion(facetVersion[i]), null, monitor);
- }
-
- } catch (CoreException e)
- {
- throw new InvocationTargetException(e);
- }
- }}, true, new NullProgressMonitor(), PlatformUI.getWorkbench().getDisplay());
- } catch (InvocationTargetException e)
- {
- if(e.getCause() instanceof CoreException)
- {
- throw (CoreException)e.getCause();
- }
- throw new RuntimeException(e);
- } catch (InterruptedException e)
- {
- throw new RuntimeException(e);
- }
-
- return result[0];
- }
-
- /**
- * Creates a dynamic web module project with "jst.web" facet ver. 2.5 installed
- * @param projectName
- * @throws CoreException
- */
- public static IProject createWeb25Project(final String projectName) throws CoreException
- {
- final IProject webProject = createProjectWithFacet(projectName, new String[]{"jst.java", "jst.web"}, new String[]{"5.0", "2.5"});
- final IJavaProject javaP = JavaCore.create(webProject);
-
- removeAllSourceFolders(javaP);
-
- return webProject;
- }
-
- /**
- * Executes a workspace runnable outside the main thread
- */
- public static void executeWorkspaceRunnable(final IWorkspaceRunnable runnable) throws CoreException
- {
- executeWorkspaceRunnable(runnable, new NullProgressMonitor());
- }
-
- private static void executeWorkspaceRunnable(final IWorkspaceRunnable runnable, final IProgressMonitor monitor) throws CoreException
- {
- if(Display.getCurrent() == null)
- {
- // Execute the runnable in the current (non-UI) thread
- workspace().run(runnable, monitor);
- }
- else
- {
- runInTestContext(runnable, monitor);
- }
- }
-
- private static void runInTestContext(final IWorkspaceRunnable runnable, final IProgressMonitor pm) throws CoreException
- {
- final IRunnableWithProgress textCtxRunnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- executeWorkspaceRunnable(runnable, monitor);
- } catch (CoreException e)
- {
- throw new InvocationTargetException(e);
- }
- }
- };
- try
- {
- TestContext.run(textCtxRunnable, true, pm, PlatformUI.getWorkbench().getDisplay());
- } catch (InvocationTargetException e)
- {
- if(e.getCause() instanceof CoreException)
- {
- throw (CoreException)e.getCause();
- }
-
- throw new IllegalStateException("Unexected exception thrown by runnable", e.getCause());
- } catch (InterruptedException e)
- {
- throw new IllegalStateException("Interruption is not supported");
- }
- }
-
- private static IWorkspace workspace()
- {
- return ResourcesPlugin.getWorkspace();
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContext.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContext.java
deleted file mode 100755
index 7f76886..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContext.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.threading;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Utility to execute runnable instances in a separate thread. Implementation is pretty similar to {@link ModalContext} but it uses {@link TestContextThread} to perform forking
- *
- * @author Danail Branekov
- *
- */
-public class TestContext
-{
- /**
- * Executes the operation specified in the caller or in a {@link TestContextThread} thread depending on the <code>fork</code> value. In case the caller of this method is a {@link TestContextThread} instance, the execution of the <code>operation</code> is performed in the current thread no matter
- * of the <code>fork</code> value
- *
- * @param operation
- * the operation; must not be null
- * @param fork
- * true to perform the <code>operation</code> in a {@link TestContextThread}; false to perform the <code>operation</code> in the current thread
- * @param monitor
- * progress monitor
- * @param display TODO
- * @throws InvocationTargetException
- * @throws InterruptedException
- */
- public static void run(final IRunnableWithProgress operation, final boolean fork, final IProgressMonitor monitor, final Display display) throws InvocationTargetException, InterruptedException
- {
- ContractChecker.nullCheckParam(operation, "operation");
-
- final boolean willFork = !isInTestContextThread() && fork;
- if (willFork)
- {
- runInTestContextThread(operation, monitor, display);
- } else
- {
- runInCurrentThread(operation, monitor);
- }
- }
-
- /**
- * Runs the operation in the current thread
- *
- * @param operation
- * the operation
- * @throws InvocationTargetException
- * if a {@link Throwable} has been thrown during operation execution. The exception wraps that {@link Throwable}
- */
- private static void runInCurrentThread(final IRunnableWithProgress operation, final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- operation.run(monitor);
- }
-
- /**
- * Runs the operation in a {@link TestContextThread}.
- *
- * @param runnable
- * operation
- * @throws InvocationTargetException
- * if the {@link TestContextThread} finished with error
- * @see TestContextThread#getError()
- */
- private static void runInTestContextThread(final IRunnableWithProgress runnable, final IProgressMonitor monitor, final Display display) throws InvocationTargetException
- {
- final TestContextThread contextThread = new TestContextThread(runnable, monitor, display);
- contextThread.start();
- contextThread.block();
-
- if (contextThread.getError() != null)
- {
- if(contextThread.getError() instanceof InvocationTargetException) {
- throw (InvocationTargetException)contextThread.getError();
- }
- else {
- throw new InvocationTargetException(contextThread.getError());
- }
- }
- }
-
- /**
- * Checks whether the current thread is instance of {@link TestContextThread}
- */
- private static boolean isInTestContextThread()
- {
- final Thread t = Thread.currentThread();
- return t instanceof TestContextThread;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContextThread.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContextThread.java
deleted file mode 100755
index ad1bb91..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContextThread.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.threading;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * {@link Thread} extender which is capable of providing event loop processing while the runnable is executed<br>
- * A typical usage of this class should be:
- *
- * <pre>
- * TestContextThread t = new TestContextThread(someRunnable());
- * t.start();
- * t.block();
- * </pre>
- *
- * The implementation of this thread resembles to the ModalContextThread with the difference that it does not call {@link Display#sleep()} and is simplified in order to meet test requirements. The reason not to call {@link Display#sleep()} is that under certain conditions putting the display to
- * sleep causes junit tests to wait forever
- *
- * @author Danail Branekov
- */
-class TestContextThread extends Thread
-{
- private boolean isRunning;
- private Throwable errorThrowable;
- private final IProgressMonitor monitor;
- private final IRunnableWithProgress runnable;
- private final Display display;
-
- TestContextThread(final IRunnableWithProgress runnable, final IProgressMonitor monitor, final Display display)
- {
- super();
- ContractChecker.nullCheckParam(runnable, "runnable");
- ContractChecker.nullCheckParam(monitor, "monitor");
-
- isRunning = true;
- this.monitor = monitor;
- this.runnable = runnable;
- this.setName("TestContext");
- this.setDaemon(true);
- this.display = display;
- }
-
- /**
- * Retrieves the error throwable which happened during execution
- *
- * @return the error throwable or null if none
- */
- public Throwable getError()
- {
- return errorThrowable;
- }
-
- @Override
- public void run()
- {
- isRunning = true;
- try
- {
- runnable.run(monitor);
- } catch (Throwable t)
- {
- errorThrowable = t;
- } finally
- {
- // Make sure that asynchronous events are processed by the event loop via sync execution of an "empty" runnable
- display().syncExec(new Runnable()
- {
- public void run()
- {
- }
- });
- isRunning = false;
-
- // Force the display to wake up
- display().asyncExec(null);
- }
- }
-
- /**
- * Blocks the caller while the {@link Runnable} specified in the constructor is being executed.<br>
- * If the caller is the UI thread, {@link Display#readAndDispatch()} is invoked in order to ensure that the event loop is processed<br>
- * If the caller is not a UI thread, this method simply joins. <br>
- *
- * @throws IllegalStateException
- * in case the method is invoked within its own thread
- */
- public void block()
- {
- if (Thread.currentThread() == this)
- {
- throw new IllegalStateException("The method should not be called from inside the same thread");
- }
-
- if (Display.getCurrent() == null)
- {
- try
- {
- join();
- } catch (Throwable e)
- {
- errorThrowable = e;
- }
- } else
- {
- while (isRunning)
- {
- if(!display().readAndDispatch())
- {
- try
- {
- Thread.sleep(50);
- } catch (InterruptedException e)
- {
- // ignore
- (new Logger()).logDebug(e.getMessage(), e);
- }
- }
- }
- }
- }
-
- private Display display()
- {
- return display;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.utils.tests/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.project b/tests/org.eclipse.jst.ws.jaxws.utils.tests/.project
deleted file mode 100755
index 4fb0308..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.utils.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.jaxws.utils.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.utils.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-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.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.utils.tests/META-INF/MANIFEST.MF
deleted file mode 100755
index 5d929dc..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.utils.tests
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.jaxws.utils,
- org.eclipse.jst.ws.jaxws.testutils,
- org.jmock,
- org.junit
-Export-Package: org.eclipse.jst.ws.jaxws.utils.resources,
- org.eclipse.jst.ws.jaxws.utils.tests,
- org.eclipse.jst.ws.jaxws.utils.tests.internal,
- org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations,
- org.eclipse.jst.ws.jaxws.utils.tests.internal.clazz
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/about.html b/tests/org.eclipse.jst.ws.jaxws.utils.tests/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</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
-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.jaxws.utils.tests/build.properties b/tests/org.eclipse.jst.ws.jaxws.utils.tests/build.properties
deleted file mode 100755
index cc88efd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.utils.tests/plugin.properties
deleted file mode 100755
index e4c600b..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=Utils Tests (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapterTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapterTest.java
deleted file mode 100755
index f2bfd9c..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapterTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.IOException;
-
-import org.eclipse.jst.ws.jaxws.utils.resources.StringInputStreamAdapter;
-
-import junit.framework.TestCase;
-
-/**
- * Test case for StringInputStreamAdapter class
- *
- * @author Danail Branekov
- *
- */
-public class StringInputStreamAdapterTest extends TestCase
-{
- public void testCreation()
- {
- try
- {
- new StringInputStreamAdapter(null);
- fail("NPE expected");
- } catch (NullPointerException e)
- {
- // expected
- assertTrue(true);
- }
-
- StringInputStreamAdapter adapter = new StringInputStreamAdapter("ABC");
- assertNotNull(adapter);
- }
-
- public void testRead()
- {
- try
- {
- StringInputStreamAdapter adapter = new StringInputStreamAdapter("ABC");
- assertTrue(adapter.read() > 0);
-
- adapter = new StringInputStreamAdapter("");
- assertTrue(adapter.read() == -1);
- } catch (IOException e)
- {
- fail(e.getMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/AllTestsSuite.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/AllTestsSuite.java
deleted file mode 100755
index f8c1bfe..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.jaxws.utils.resources.StringInputStreamAdapterTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.FileUtilsUnitTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.JaxWsUtilsTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationFactoryTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationInspectorImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationPropertyContainerTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationUtilsTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationsBaseImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.ArrayValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.BooleanValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.ClassValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.IntegerValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.ParamValuePairImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.QualifiedNameValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.StringValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.clazz.ASTUtilsTest;
-
-
-public class AllTestsSuite
-{
- /**
- * Returns a test suite containing the tests to be run by Java Developer Test Dispatcher
- *
- * @return - a suite of junit pde test
- */
- public static Test suite()
- {
- final TestSuite suite = new TestSuite();
-
- suite.addTestSuite(AnnotationFactoryTest.class);
- suite.addTestSuite(ArrayValueImplTest.class);
- suite.addTestSuite(AnnotationsBaseImplTest.class);
- suite.addTestSuite(AnnotationInspectorImplTest.class);
- suite.addTestSuite(AnnotationUtilsTest.class);
- suite.addTestSuite(BooleanValueImplTest.class);
- suite.addTestSuite(IntegerValueImplTest.class);
- suite.addTestSuite(ParamValuePairImplTest.class);
- suite.addTestSuite(QualifiedNameValueImplTest.class);
- suite.addTestSuite(StringValueImplTest.class);
- suite.addTestSuite(ClassValueImplTest.class);
- suite.addTestSuite(AnnotationPropertyContainerTest.class);
- suite.addTestSuite(ASTUtilsTest.class);
- suite.addTestSuite(FileUtilsUnitTest.class);
- suite.addTestSuite(JaxWsUtilsTest.class);
- suite.addTestSuite(StringInputStreamAdapterTest.class);
-
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/FileUtilsUnitTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/FileUtilsUnitTest.java
deleted file mode 100755
index 5d4a914..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/FileUtilsUnitTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.Mock;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.IFileUtils;
-import org.jmock.core.constraint.IsEqual;
-import org.jmock.core.constraint.IsSame;
-
-public class FileUtilsUnitTest extends MockObjectTestCase
-{
- private final IFileUtils fileUtils = FileUtils.getInstance();
- private Mock<ICompilationUnit> cuMock;
- private final IProgressMonitor monitor = new NullProgressMonitor();
-
- @Override
- protected void setUp() throws Exception
- {
- cuMock = mock(ICompilationUnit.class);
- }
-
- public void testSetCompilationUnitContentDealsCorrectlyWithWorkingCopy() throws JavaModelException
- {
- final String testContent = "MyTestContent";
- final Mock<IBuffer> bufferMock = mock(IBuffer.class);
- bufferMock.expects(once()).method("setContents").with(new IsSame(testContent));
-
- cuMock.expects(once()).method("becomeWorkingCopy");
- cuMock.expects(once()).method("getBuffer").will(returnValue(bufferMock.proxy()));
- cuMock.expects(once()).method("commitWorkingCopy").with(new IsEqual(true), new IsSame(monitor));
- cuMock.expects(once()).method("discardWorkingCopy");
-
- fileUtils.setCompilationUnitContent(cuMock.proxy(), testContent, true, monitor);
- }
-
- public void testSetCompilationUnitContentDoesNotDiscardWorkingCopyOnJME()
- {
- final JavaModelException testException = new JavaModelException(new CoreException(StatusUtils.statusError("TEST")));
- cuMock.expects(once()).method("becomeWorkingCopy").will(throwException(testException));
- cuMock.expects(never()).method("discardWorkingCopy");
- cuMock.expects(never()).method("commitWorkingCopy");
-
- try
- {
- fileUtils.setCompilationUnitContent(cuMock.proxy(), "123", true, monitor);
- }
- catch(JavaModelException e)
- {
- assertTrue("Test exception was not caught", e == testException);
- }
- }
-
- public void testSetCuContentSavesDirtyEditors() throws JavaModelException
- {
- final boolean[] saveEditorInvoked = new boolean[]{false};
- final boolean[] setContentsInvoked = new boolean[]{false};
-
- final IFileUtils myFileUtils = new FileUtils(){
- public boolean isCompilationUnitDisplayedInDirtyEditor(final ICompilationUnit cu)
- {
- assertTrue("Unexpected compilation unit", cu == cuMock.proxy());
- return true;
- }
-
- @Override
- public void saveEditor(final ICompilationUnit cu)
- {
- assertTrue("Save editors invoked before set CU content", setContentsInvoked[0]);
- assertTrue("Unexpected compilation unit", cu == cuMock.proxy());
- saveEditorInvoked[0] = true;
- }
-
- @Override
- public void setCompilationUnitContent(ICompilationUnit unit, String content, boolean force, IProgressMonitor monitor)
- throws JavaModelException
- {
- assertFalse("Set CU content invoked after editor saved", saveEditorInvoked[0]);
- assertEquals("Unexpected CU content", "MyContent", content);
- setContentsInvoked[0] = true;
- }
- };
-
- myFileUtils.setCompilationUnitContentAndSaveDirtyEditors(cuMock.proxy(), "MyContent", true, null);
- assertTrue("Set contents not invoked", setContentsInvoked[0]);
- assertTrue("Save editors not invoked", saveEditorInvoked[0]);
- }
-
- public void testSetCuContentDoesNotSavesCleanEditors() throws JavaModelException
- {
- final boolean[] isDisplayedInvoked = new boolean[]{false};
- final boolean[] setContentsInvoked = new boolean[]{false};
-
- final IFileUtils myFileUtils = new FileUtils(){
- public boolean isCompilationUnitDisplayedInDirtyEditor(final ICompilationUnit cu)
- {
- assertTrue("Unexpected compilation unit", cu == cuMock.proxy());
- isDisplayedInvoked[0] = true;
- return false;
- }
-
- @Override
- public void saveEditor(final ICompilationUnit cu)
- {
- fail("Unexpected invocation");
- }
-
- @Override
- public void setCompilationUnitContent(ICompilationUnit unit, String content, boolean force, IProgressMonitor monitor)
- throws JavaModelException
- {
- assertFalse("Set CU content invoked after editor saved", isDisplayedInvoked[0]);
- assertEquals("Unexpected CU content", "MyContent", content);
- setContentsInvoked[0] = true;
- }
- };
-
- myFileUtils.setCompilationUnitContentAndSaveDirtyEditors(cuMock.proxy(), "MyContent", true, null);
- assertTrue("Set contents not invoked", setContentsInvoked[0]);
- assertTrue("Is displayed in dirty editor not invoked", isDisplayedInvoked[0]);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/JaxWsUtilsTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/JaxWsUtilsTest.java
deleted file mode 100755
index 010f4b5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/JaxWsUtilsTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal;
-
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.utils.JaxWsUtils;
-
-public class JaxWsUtilsTest extends MockObjectTestCase
-{
- private static final String CLASS_NAME = "TestBean";
- private static final String CLASS_FQ_NAME = "org.eclipse.test." + CLASS_NAME;
-
-
- public void testComposeJaxWsTargetNamespaceByPackage_WithNull()
- {
- try
- {
- JaxWsUtils.composeJaxWsTargetNamespaceByPackage(null);
- fail("NPE expected");
- } catch (Exception e)
- {
- // expected
- assertTrue(true);
- }
- }
-
- public void testComposeJaxWsTargetNamespaceByPackage()
- {
- String ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("");
- assertTrue(ns.equals("http:///"));
- ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("a");
- assertTrue(ns.equals("http://a/"));
- ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("a.b.c");
- assertTrue(ns.equals("http://b.a/c/"));
- ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("a.b.c.d");
- assertTrue(ns.equals("http://b.a/c/d/"));
- ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("a.b.c.d.e");
- assertTrue(ns.equals("http://b.a/c/d/e/"));
- }
-
- public void testGetDefaultServiceName()
- {
- try {
- JaxWsUtils.getDefaultServiceName(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException _){}
-
- assertEquals(CLASS_NAME + "Service", JaxWsUtils.getDefaultServiceName(CLASS_FQ_NAME));
- }
-
- public void testGetDefaultPorttypeName()
- {
- try {
- JaxWsUtils.getDefaultPorttypeName(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException _){}
-
- assertEquals(CLASS_NAME, JaxWsUtils.getDefaultPorttypeName(CLASS_FQ_NAME));
- }
-
- public void testGetDefaultPortName()
- {
- try {
- JaxWsUtils.getDefaultPortName(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException _){}
-
- assertEquals(CLASS_NAME + "Port", JaxWsUtils.getDefaultPortName(CLASS_FQ_NAME));
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationFactoryTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationFactoryTest.java
deleted file mode 100755
index dd0cb95..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationFactoryTest.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * AnnotationFactory class test cases.
- *
- * @author Georgi Vachkov
- */
-@SuppressWarnings("nls")
-public class AnnotationFactoryTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
-
- public void testCreateStringValue()
- {
- try
- {
- AnnotationFactory.createStringValue(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- IValue strValue = AnnotationFactory.createStringValue("value");
- assertNotNull(strValue);
- assertTrue(strValue.toString().equals("value"));
- }
-
- public void testCreateParamValuePair()
- {
- IValue strValue = AnnotationFactory.createStringValue("value");
-
- try
- {
- AnnotationFactory.createParamValuePairValue(null, strValue);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.createParamValuePairValue("", null);
- fail("NullPointerException not thrown");
- fail("IllegalArgumentException not thrown");
- }
- catch (NullPointerException e)
- {
- }
- catch (IllegalArgumentException e)
- {
- }
-
- try
- {
- AnnotationFactory.createParamValuePairValue("param", null);
- fail("NullPointerException not thrown");
- }
- catch (NullPointerException e)
- {
- }
-
- IParamValuePair valuePair = AnnotationFactory.createParamValuePairValue("param", strValue);
- assertNotNull(valuePair);
- assertTrue(valuePair.getValue() instanceof IValue);
- assertTrue(valuePair.getParam().equals("param"));
- }
-
- public void testCreateComplexAnnotation() throws Exception
- {
- IValue strValue1 = AnnotationFactory.createStringValue("value");
- IParamValuePair valuePair1 = AnnotationFactory.createParamValuePairValue("param", strValue1);
-
- IValue strValue2 = AnnotationFactory.createStringValue("value1");
- IParamValuePair valuePair2 = AnnotationFactory.createParamValuePairValue("param1", strValue2);
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
- paramValues.add(valuePair1);
- paramValues.add(valuePair2);
-
- try
- {
- AnnotationFactory.createAnnotation(null, paramValues, endpoint);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.createAnnotation("", null, endpoint);
- fail("NullPointerException not thrown");
- fail("IllegalArgumentException not thrown");
- }
- catch (NullPointerException e)
- {
- }
- catch (IllegalArgumentException e)
- {
- }
-
- try
- {
- AnnotationFactory.createAnnotation("MyName", null, endpoint);
- fail("NullPointerException not thrown");
- }
- catch (NullPointerException e)
- {
- }
-
-// try
-// {
-// AnnotationFactory.createAnnotation("MyName", new HashSet<IParamValuePair>());
-// fail("IllegalArgumentException not thrown");
-// }
-// catch (IllegalArgumentException e)
-// {
-// }
-
-
- prepareProject();
- IAnnotation<IType> ca = AnnotationFactory.createAnnotation("name", paramValues, endpoint);
- assertNotNull(ca);
- assertEquals(ca.getParamValuePairs().size(), 2);
- }
-
- public void testCreateValuePair()
- {
- try
- {
- AnnotationFactory.createParamValuePairValue("", null);
- fail("NullPointerException not thrown");
- fail("IllegalArgumentException not thrown");
- }
- catch (NullPointerException e)
- {
- }
- catch (IllegalArgumentException e)
- {
- }
-
- try
- {
- AnnotationFactory.createParamValuePairValue(null, null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
- }
-
- public void testCreateArrayValue()
- {
- try
- {
- AnnotationFactory.createArrayValue(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.createArrayValue(new HashSet<IValue>());
- fail("IllegalArgumentException not thrown");
- } catch (IllegalArgumentException e)
- {
- }
-
- IValue strValue1 = AnnotationFactory.createStringValue("value1");
- IValue strValue2 = AnnotationFactory.createStringValue("value2");
- Set<IValue> values = new HashSet<IValue>();
- values.add(strValue1);
- values.add(strValue2);
-
-
- IValue arrValue = AnnotationFactory.createArrayValue(values);
- assertNotNull(arrValue);
- assertTrue(arrValue.toString().equals("[value1, value2]"));
- }
-
- public void testCreateQualifiedNameValue()
- {
-
- try
- {
- AnnotationFactory.createQualifiedNameValue("QName");
- fail("IllegalArgumentException not thrown");
- }
- catch (IllegalArgumentException e)
- {
- }
-
- try
- {
- AnnotationFactory.createQualifiedNameValue(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- IValue qName = AnnotationFactory.createQualifiedNameValue("org.eclipse.demo.Test");
- assertNotNull(qName);
- assertTrue(qName.toString().equals("org.eclipse.demo.Test"));
- }
-
- public void testCreateBooleanValue()
- {
- IValue boolValue = AnnotationFactory.createBooleanValue(true);
- assertNotNull(boolValue);
- assertEquals(boolValue.toString(), "true");
- }
-
- public void testGetAnnotationsFromClass() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(annotations);
- assertTrue(annotations.size() == 2);
- }
-
-// public void testGetAnnotationsFromField() throws Exception // $JL-EXC$
-// {
-// prepareProject();
-//
-// IField field = endpoint.getField("field1");
-// assertNotNull(field);
-//
-// IAnnotation[] annotations = AnnotationFactory.createAnnotattionInspector(endpoint).inspectMethod(method) getAnnotationsFromField(field);
-// assertNotNull(annotations);
-// assertTrue(annotations.length == 1);
-// }
-
- public void testGetAnnotationsFromMethod() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- Collection<IAnnotation<IMethod>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);;
- assertNotNull(annotations);
- assertTrue(annotations.size() == 1);
- }
-
- public void testRemoveAnnotationsIType() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- try
- {
- AnnotationFactory.removeAnnotationsFromJavaElement(null);
- fail("NullPointerException not thrown");
- }
- catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint.getPackageFragment());
- fail("IllegalArgumentException not thrown");
- }
- catch (IllegalArgumentException e)
- {
- }
-
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint). inspectType();
- assertTrue(annotations.size() == 0);
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- @SuppressWarnings("unused")
- Collection<IAnnotation<IMethod>> annotationsMethod = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotations.size() == 0);
- }
-
- public void testRemoveAnnotationsITypeSetOfString() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- Set<String> toRemove = new HashSet<String>();
- toRemove.add("WebService");
- toRemove.add("WebMethod");
-
- try
- {
- AnnotationFactory.removeAnnotations(null, toRemove);
- fail("NullPointerException not thrown");
- }
- catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.removeAnnotations(endpoint.getPackageFragment(), toRemove);
- fail("IllegalArgumentException not thrown");
- }
- catch (IllegalArgumentException e)
- {
- }
-
-
- AnnotationFactory.removeAnnotations(endpoint, toRemove);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 1);
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- Collection<IAnnotation<IMethod>> annotationsMethod = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsMethod.size() == 0);
- }
-
- public void testRemoveAnnotationsIField() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- IField field = endpoint.getField("field1");
- assertNotNull(field);
-
- AnnotationFactory.removeAnnotationsFromJavaElement(field);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 2);
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- Collection<IAnnotation<IMethod>> annotationsMethod = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsMethod.size() == 1);
-
-// annotations = AnnotationFactory.getAnnotationsFromField(field);
-// assertNotNull(annotations);
-// assertTrue(annotations.length == 0);
- }
-
- public void testRemoveAnnotationsIMethod() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- endpoint.getField("field1");
-
- AnnotationFactory.removeAnnotationsFromJavaElement(method);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 2);
-
- Collection<IAnnotation<IMethod>> annotationsMethod = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsMethod.size()== 0);
-
-// annotations = AnnotationFactory.getAnnotationsFromField(field);
-// assertNotNull(annotations);
-// assertTrue(annotations.length == 0);
- }
-
- private void prepareProject() throws Exception // $JL-EXC$
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationInspectorImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationInspectorImplTest.java
deleted file mode 100755
index 10845b8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationInspectorImplTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class AnnotationInspectorImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void setUpSpecific() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("EndpointAnnInspector.src", "EndpointAnnInspector");
- }
-
- public void testInspector() throws Exception
- {
- setUp();
-
- try
- {
- AnnotationFactory.createAnnotationInspector(null).inspectType();
- fail("NullPointerException should be thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(null);
- fail("NullPointerException should be thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationFactory.createAnnotationInspector(endpoint).inspectField(null);
- fail("NullPointerException should be thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(null);
- fail("NullPointerException should be thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- IValue sv = AnnotationFactory.createStringValue("My Value");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", sv));
-
- IAnnotation<IField> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint.getField("field1"));
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint.getField("field1"));
-
- Collection<IAnnotation<IField>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(endpoint.getField("field1"));
- assertNotNull(annotations);
- assertTrue(annotations.size() == 1);
- IAnnotation<IField> annP = annotations.iterator().next();
- AnnotationWriter.getInstance().remove(annP);
-
- annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(endpoint.getField("field1"));
- assertNotNull(annotations);
- assertTrue(annotations.size() == 0);
-
-
- IMethod[] methods = endpoint.getMethods();
- for (IMethod method : methods)
- {
- if(method.getRawParameterNames() != null && method.getRawParameterNames().length > 0)
- {
- for(int i = 0; i < method.getRawParameterNames().length; i++)
- {
- ITypeParameter param = method.getTypeParameter(method.getRawParameterNames()[i]);
-
- IValue svParam = AnnotationFactory.createStringValue("String Valu Param");
- Set<IParamValuePair> pvParam = new HashSet<IParamValuePair>();
- pvParam.add(AnnotationFactory.createParamValuePairValue("ParamAtribute", svParam));
- IAnnotation<ITypeParameter> annPam = AnnotationFactory.createAnnotation("ParamAnnotation", pvParam, param);
- AnnotationWriter.getInstance().setAppliedElement(annPam, param);
- Collection<IAnnotation<ITypeParameter>> paramAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(param);
- assertNotNull(paramAnnotations);
- assertTrue(paramAnnotations.size() == 1);
- IAnnotation<ITypeParameter> tmpAnn = paramAnnotations.iterator().next();
-
- AnnotationWriter.getInstance().remove(tmpAnn);
- paramAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(param);
- assertNotNull(paramAnnotations);
- assertTrue(paramAnnotations.size() == 0);
-
- annPam = AnnotationFactory.createAnnotation("ParamAnnotation2", pvParam, param);
- AnnotationWriter.getInstance().setAppliedElement(annPam, param);
- paramAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(param);
- assertNotNull(paramAnnotations);
- assertTrue(paramAnnotations.size() == 1);
- AnnotationFactory.removeAnnotationsFromJavaElement(param);
- paramAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(param);
- assertNotNull(paramAnnotations);
- assertTrue(paramAnnotations.size() == 0);
- }
- }
- }
- }
-
- public void testInspectorSpecificAnnotation() throws Exception
- {
- setUpSpecific();
-
- IAnnotation<IType> inspectedTypeAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("org.eclipse.demo.MyAnnotation");
- assertNotNull(inspectedTypeAnnotation);
- assertEquals(inspectedTypeAnnotation.getPropertyValue("myValue"), "MyString");
-
- inspectedTypeAnnotation = null;
-
- inspectedTypeAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("javax.jws.WebService");
- assertNotNull(inspectedTypeAnnotation);
- assertTrue("javax.jws.WebService".endsWith(inspectedTypeAnnotation.getAnnotationName()));
- assertEquals(inspectedTypeAnnotation.getPropertyValue("serviceName"), "WSImplBeanService");
- assertEquals(inspectedTypeAnnotation.getPropertyValue("name"), "WSImplBean");
- assertEquals(inspectedTypeAnnotation.getPropertyValue("targetNamespace"), "http://demo/eclipse/org/");
- assertEquals(inspectedTypeAnnotation.getPropertyValue("portName"), "WSImplBeanPort");
-
- IField field = endpoint.getField("field1");
- IAnnotation<IField> inspectedFieldAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(field, "org.eclipse.demo.MyFieldAnnotation");
- assertNotNull(inspectedFieldAnnotation);
- assertTrue("org.eclipse.demo.MyFieldAnnotation".endsWith(inspectedFieldAnnotation.getAnnotationName()));
- assertEquals(inspectedFieldAnnotation.getPropertyValue("name"), "field1");
-
- inspectedFieldAnnotation = null;
-
- inspectedFieldAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(field, "javax.jws.WebField");
- assertNotNull(inspectedFieldAnnotation);
- assertTrue("javax.jws.WebField".endsWith(inspectedFieldAnnotation.getAnnotationName()));
- assertEquals(inspectedFieldAnnotation.getPropertyValue("name"), "MyField");
-
- IMethod method = endpoint.getMethods()[0];
- IAnnotation<IMethod> inspectedMethodAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method, "org.eclipse.demo.MyMethodAnnotation");
- assertNotNull(inspectedMethodAnnotation);
- assertTrue("org.eclipse.demo.MyMethodAnnotation".endsWith(inspectedMethodAnnotation.getAnnotationName()));
- assertEquals(inspectedMethodAnnotation.getPropertyValue("name"), "annotatedMethod");
-
- inspectedMethodAnnotation = null;
-
- inspectedMethodAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method, "javax.jws.WebMethod");
- assertNotNull(inspectedMethodAnnotation);
- assertTrue("javax.jws.WebMethod".endsWith(inspectedMethodAnnotation.getAnnotationName()));
- assertEquals(inspectedMethodAnnotation.getPropertyValue("exclude"), "false");
- assertEquals(inspectedMethodAnnotation.getPropertyValue("operationName"), "test");
-
- ITypeParameter typeParameter = method.getTypeParameter("annotatedParam");
- IAnnotation<ITypeParameter> inspectedParamAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter, "org.eclipse.demo.MyParamAnnotation");
- assertNotNull(inspectedParamAnnotation);
- assertTrue("org.eclipse.demo.MyParamAnnotation".endsWith(inspectedParamAnnotation.getAnnotationName()));
- assertEquals(inspectedParamAnnotation.getPropertyValue("name"), "annotatedMyParam");
-
- inspectedParamAnnotation = null;
-
- inspectedParamAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter, "javax.jws.WebParam");
- assertNotNull(inspectedParamAnnotation);
- assertTrue("javax.jws.WebParam".endsWith(inspectedParamAnnotation.getAnnotationName()));
- assertEquals(inspectedParamAnnotation.getPropertyValue("name"), "annotatedParam");
- }
-
- public void testInspectorLocatorRetrieved() throws Exception
- {
- setUpSpecific();
- IAnnotation<IType> annotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("javax.jws.WebService");
- assertNotNull(annotation);
-
- assertEquals(11, annotation.getLocator().getLineNumber());
- assertEquals(226, annotation.getLocator().getStartPosition());
- assertEquals(134, annotation.getLocator().getLength());
-
- assertEquals(11, getParam("portName", annotation).getLocator().getLineNumber());
- assertEquals(334, getParam("portName", annotation).getLocator().getStartPosition());
- assertEquals(25, getParam("portName", annotation).getLocator().getLength());
- }
-
- private IParamValuePair getParam(final String name, final IAnnotation<? extends IJavaElement> annotation)
- {
- for (IParamValuePair param : annotation.getParamValuePairs()) {
- if(param.getParam().equals(name)) {
- return param;
- }
- }
-
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationPropertyContainerTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationPropertyContainerTest.java
deleted file mode 100755
index f0dbe7f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationPropertyContainerTest.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.lang.annotation.ElementType;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.Mock;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationProperty;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationPropertyContainer;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AttributeTypeEnum;
-
-public class AnnotationPropertyContainerTest extends MockObjectTestCase
-{
- private Mock<IType> type = mock(IType.class);
- private Mock<IMethod> method = mock(IMethod.class);
- private Mock<ITypeParameter> typeParameter = mock(ITypeParameter.class);
-
- public void testBase() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- try
- {
- container.addAnnotationProperty(null, null);
- fail("NullPointerException was not thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeName", "value", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, null);
- fail("NullPointerException was not thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeName", "value", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.PACKAGE);
- fail("IllegalArgumentException was not thrown!");
- }
- catch (IllegalArgumentException e)
- {
- assertTrue(true);
- }
-
- }
-
- public void testTypeLevel() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 1);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 0);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 0);
- Set<IAnnotation<IType>> typeAnnotations = container.getTypeAnnotations(type.proxy());
-
- for (IAnnotation<IType> annotation : typeAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("annotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
-
- container = new AnnotationPropertyContainer();
- annotationProperty = new AnnotationProperty("annotationName1", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName2", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName3", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName4", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 4);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 0);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 0);
- typeAnnotations = container.getTypeAnnotations(type.proxy());
-
- Set<String> names = new HashSet<String>();
- names.clear();
- names.add("annotationName1");
- names.add("annotationName2");
- names.add("annotationName3");
- names.add("annotationName4");
-
- for (IAnnotation<IType> annotation : typeAnnotations)
- {
- assertTrue(names.contains(annotation.getAnnotationName()));
- names.remove(annotation.getAnnotationName());
- if(annotation.getAnnotationName().equals("annotationName1"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- }
- if(annotation.getAnnotationName().equals("annotationName2"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- }
- if(annotation.getAnnotationName().equals("annotationName3"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- }
- if(annotation.getAnnotationName().equals("annotationName4"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
- }
- }
-
- public void testMethodLevel() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 0);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 0);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 1);
- Set<IAnnotation<IMethod>> methodAnnotations = container.getMethodAnnotations(method.proxy());
-
- for (IAnnotation<IMethod> annotation : methodAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("annotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
-
- container = new AnnotationPropertyContainer();
- annotationProperty = new AnnotationProperty("annotationName1", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName2", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName3", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName4", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 0);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 0);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 4);
- methodAnnotations = container.getMethodAnnotations(method.proxy());
-
- Set<String> names = new HashSet<String>();
- names.clear();
- names.add("annotationName1");
- names.add("annotationName2");
- names.add("annotationName3");
- names.add("annotationName4");
-
- for (IAnnotation<IMethod> annotation : methodAnnotations)
- {
- assertTrue(names.contains(annotation.getAnnotationName()));
- names.remove(annotation.getAnnotationName());
- if(annotation.getAnnotationName().equals("annotationName1"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- }
- if(annotation.getAnnotationName().equals("annotationName2"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- }
- if(annotation.getAnnotationName().equals("annotationName3"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- }
- if(annotation.getAnnotationName().equals("annotationName4"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
- }
- }
-
- public void testParameterLevel() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 0);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 1);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 0);
- Set<IAnnotation<ITypeParameter>> parameterAnnotations = container.getParameterAnnotations(typeParameter.proxy());
-
- for (IAnnotation<ITypeParameter> annotation : parameterAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("annotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
-
- container = new AnnotationPropertyContainer();
- annotationProperty = new AnnotationProperty("annotationName1", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName2", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName3", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName4", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 0);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 4);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 0);
- parameterAnnotations = container.getParameterAnnotations(typeParameter.proxy());
-
- Set<String> names = new HashSet<String>();
- names.clear();
- names.add("annotationName1");
- names.add("annotationName2");
- names.add("annotationName3");
- names.add("annotationName4");
-
- for (IAnnotation<ITypeParameter> annotation : parameterAnnotations)
- {
- assertTrue(names.contains(annotation.getAnnotationName()));
- names.remove(annotation.getAnnotationName());
- if(annotation.getAnnotationName().equals("annotationName1"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- }
- if(annotation.getAnnotationName().equals("annotationName2"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- }
- if(annotation.getAnnotationName().equals("annotationName3"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- }
- if(annotation.getAnnotationName().equals("annotationName4"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
- }
- }
-
- public void testCombined() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- AnnotationProperty annotationProperty = new AnnotationProperty("paramAnnotationName", "paramAttributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("paramAnnotationName", "paramAttributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("paramAnnotationName", "paramAttributeNameQualified", "org.eclipse.testEnumeration.PARAM_VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("paramAnnotationName", "paramAttributeNameString", "paramValueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
-
- annotationProperty = new AnnotationProperty("methodAnnotationName", "methodAttributeNameBoolean", "false", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("methodAnnotationName", "methodAttributeNameInteger", "101", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("methodAnnotationName", "methodAttributeNameQualified", "org.eclipse.testEnumeration.METHOD_VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("methodAnnotationName", "methodAttributeNameString", "methodValueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
-
- annotationProperty = new AnnotationProperty("typeAnnotationName", "typeAttributeNameBoolean", "false", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("typeAnnotationName", "typeAttributeNameInteger", "1", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("typeAnnotationName", "typeAttributeNameQualified", "org.eclipse.testEnumeration.TYPE_VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("typeAnnotationName", "typeAttributeNameString", "typeValueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 1);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 1);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 1);
-
- Set<IAnnotation<ITypeParameter>> parameterAnnotations = container.getParameterAnnotations(typeParameter.proxy());
- for (IAnnotation<ITypeParameter> annotation : parameterAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("paramAnnotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("paramAttributeNameBoolean").equals("true"));
- assertTrue(annotation.getPropertyValue("paramAttributeNameInteger").equals("100"));
- assertTrue(annotation.getPropertyValue("paramAttributeNameQualified").equals("org.eclipse.testEnumeration.PARAM_VALUE"));
- assertTrue(annotation.getPropertyValue("paramAttributeNameString").equals("paramValueString"));
- }
-
- Set<IAnnotation<IMethod>> methodAnnotations = container.getMethodAnnotations(method.proxy());
- for (IAnnotation<IMethod> annotation : methodAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("methodAnnotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("methodAttributeNameBoolean").equals("false"));
- assertTrue(annotation.getPropertyValue("methodAttributeNameInteger").equals("101"));
- assertTrue(annotation.getPropertyValue("methodAttributeNameQualified").equals("org.eclipse.testEnumeration.METHOD_VALUE"));
- assertTrue(annotation.getPropertyValue("methodAttributeNameString").equals("methodValueString"));
- }
-
- Set<IAnnotation<IType>> typeAnnotations = container.getTypeAnnotations(type.proxy());
- for (IAnnotation<IType> annotation : typeAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("typeAnnotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("typeAttributeNameBoolean").equals("false"));
- assertTrue(annotation.getPropertyValue("typeAttributeNameInteger").equals("1"));
- assertTrue(annotation.getPropertyValue("typeAttributeNameQualified").equals("org.eclipse.testEnumeration.TYPE_VALUE"));
- assertTrue(annotation.getPropertyValue("typeAttributeNameString").equals("typeValueString"));
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationUtilsTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationUtilsTest.java
deleted file mode 100755
index ed2452f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationUtilsTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class AnnotationUtilsTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testRemove() throws Exception
- {
- setUp();
-
- IValue sv = AnnotationFactory.createStringValue("My String Value");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("Param", sv));
-
- IAnnotation<IField> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint.getField("field1"));
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint.getField("field1"));
- assertEquals(ann.getAppliedElement(), endpoint.getField("field1"));
-
- AnnotationWriter.getInstance().remove(ann);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsBaseImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsBaseImplTest.java
deleted file mode 100755
index 815d146..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsBaseImplTest.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationImpl;
-
-public class AnnotationsBaseImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- setUpWitoutRemove();
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void setUpWitoutRemove() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- }
-
- public void setUpWitoutRemove2() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("EndpointAnnInspector.src", "EndpointAnnInspector");
- }
-
- public void testBaseAnnotattionFunctionality()
- {
- AnnotationImpl<IType> ann = new AnnotationImpl<IType>("com.spa.test.MyAnnotation", new HashSet<IParamValuePair>());
- assertEquals(ann.getAnnotationName(), "com.spa.test.MyAnnotation");
- assertEquals(ann.getSimpleAnnotationName(), "MyAnnotation");
- //assertEquals(ann.getValueType(), IValue.ANNOTATION_VALUE);
-
- ann = new AnnotationImpl<IType>("MyNewAnnotation", new HashSet<IParamValuePair>());
- assertEquals(ann.getAnnotationName(), "MyNewAnnotation");
- assertEquals(ann.getSimpleAnnotationName(), "MyNewAnnotation");
- //assertEquals(ann.getValueType(), IValue.ANNOTATION_VALUE);
- }
-
- public void testAddAnnotation() throws Exception
- {
- setUp();
-
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(annotations);
- assertTrue(annotations.size() == 1);
- IAnnotation<IType> tmpAnn = annotations.iterator().next();
-
- AnnotationWriter.getInstance().remove(tmpAnn);
-
- annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 0);
-
- IMethod[] methods = endpoint.getMethods();
- for (IMethod method : methods)
- {
- if(method.getRawParameterNames() != null && method.getRawParameterNames().length > 0)
- {
- IAnnotation<IMethod> annM = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotationMethod", pv, method);
- AnnotationWriter.getInstance().setAppliedElement(annM, method);
- assertEquals("full.qualified.Name", annM.getPropertyValue("param"));
- assertNull(annM.getPropertyValue("paramNotExists"));
- Collection<IAnnotation<IMethod>> annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- IAnnotation<IMethod> annotatM = annotationsM.iterator().next();
- assertEquals("qualified.Name", annotatM.getPropertyValue("param"));
-
- IValue sv = AnnotationFactory.createStringValue("New String Value");
- annM.getParamValuePairs().add(AnnotationFactory.createParamValuePairValue("NewParam", sv));
- AnnotationWriter.getInstance().update(annM);
- annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsM.size() == 1);
- annotatM = annotationsM.iterator().next();
- assertEquals("New String Value", annotatM.getPropertyValue("NewParam"));
- assertEquals("qualified.Name", annotatM.getPropertyValue("param"));
- AnnotationWriter.getInstance().remove(annotatM);
- annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsM.size() == 0);
-
- IValue sv3 = AnnotationFactory.createStringValue("New String Value3");
- annM.getParamValuePairs().clear();
- annM.getParamValuePairs().add(AnnotationFactory.createParamValuePairValue("NewParam", sv3));
- AnnotationWriter.getInstance().update(annM);
- annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsM.size() == 1);
- annotatM = annotationsM.iterator().next();
- assertEquals("New String Value3", annotatM.getPropertyValue("NewParam"));
-
- // clear annotation
- AnnotationWriter.getInstance().remove(annM);
-
- annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsM.size() == 0);
-
- for(int i = 0; i < method.getRawParameterNames().length; i++)
- {
- ITypeParameter param = method.getTypeParameter(method.getRawParameterNames()[i]);
-
- IValue svParam = AnnotationFactory.createStringValue("String Valu Param");
- Set<IParamValuePair> pvParam = new HashSet<IParamValuePair>();
- pvParam.add(AnnotationFactory.createParamValuePairValue("ParamAtribute", svParam));
- IAnnotation<ITypeParameter> annP = AnnotationFactory.createAnnotation("ParamAnnotation", pvParam, param);
- AnnotationWriter.getInstance().setAppliedElement(annP, param);
-
- AnnotationWriter.getInstance().remove(annP);
- }
- }
- }
- }
-
- public void testAnnotattionUpdate() throws Exception
- {
- setUp();
-
- IValue sv = AnnotationFactory.createStringValue("StringValue");
- Set<IParamValuePair> spv = new HashSet<IParamValuePair>();
- spv.add(AnnotationFactory.createParamValuePairValue("stringParam", sv));
- IAnnotation<IType> typeAnnotation = AnnotationFactory.createAnnotation("org.eclipse.test.MyTypeAnnotation", spv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(typeAnnotation, endpoint);
-
- Collection<IAnnotation<IType>> typeAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(typeAnnotations);
- assertTrue(typeAnnotations.size() == 1);
- IAnnotation<IType> tempTypeAnnotation = typeAnnotations.iterator().next();
- assertEquals(tempTypeAnnotation.getPropertyValue("stringParam"), "StringValue");
-
- IValue newSV = AnnotationFactory.createStringValue("NewStringValue");
- Set<IParamValuePair> newSPV = new HashSet<IParamValuePair>();
- newSPV.add(AnnotationFactory.createParamValuePairValue("stringParam", newSV));
- AnnotationImpl<IType> newTypeAnnotation = new AnnotationImpl<IType>("org.eclipse.test.MyTypeAnnotation", newSPV);
- newTypeAnnotation.setAppliedElementWithoutSave(endpoint);
-
- AnnotationWriter.getInstance().update(newTypeAnnotation);
-
- typeAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(typeAnnotations);
- assertTrue(typeAnnotations.size() == 1);
- tempTypeAnnotation = typeAnnotations.iterator().next();
- assertEquals(tempTypeAnnotation.getPropertyValue("stringParam"), "NewStringValue");
-
- newSV = AnnotationFactory.createStringValue("NewestStringValue");
- newSPV = new HashSet<IParamValuePair>();
- newSPV.add(AnnotationFactory.createParamValuePairValue("newestStringParam", newSV));
- newTypeAnnotation = new AnnotationImpl<IType>("org.eclipse.test.MyTypeAnnotation", newSPV);
- newTypeAnnotation.setAppliedElementWithoutSave(endpoint);
-
- AnnotationWriter.getInstance().update(newTypeAnnotation);
-
- typeAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(typeAnnotations);
- assertTrue(typeAnnotations.size() == 1);
- tempTypeAnnotation = typeAnnotations.iterator().next();
- assertNull(tempTypeAnnotation.getPropertyValue("stringParam"));
- assertEquals(tempTypeAnnotation.getPropertyValue("newestStringParam"), "NewestStringValue");
-
- IMethod firstMethod = endpoint.getMethods()[0];
-
- IValue iv = AnnotationFactory.createIntegerValue("10");
- Set<IParamValuePair> ipv = new HashSet<IParamValuePair>();
- ipv.add(AnnotationFactory.createParamValuePairValue("integerParam", iv));
- IAnnotation<IMethod> methodAnnotation = AnnotationFactory.createAnnotation("org.eclipse.test.MyMethodAnnotation", ipv, firstMethod);
- AnnotationWriter.getInstance().setAppliedElement(methodAnnotation, firstMethod);
-
- Collection<IAnnotation<IMethod>> methodAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(firstMethod);
- assertNotNull(methodAnnotations);
- assertTrue(methodAnnotations.size() == 1);
- IAnnotation<IMethod> tempMethodAnnotation = methodAnnotations.iterator().next();
- assertEquals(tempMethodAnnotation.getPropertyValue("integerParam"), "10");
-
- IValue newIV = AnnotationFactory.createIntegerValue("11");
- Set<IParamValuePair> newIPV = new HashSet<IParamValuePair>();
- newIPV.add(AnnotationFactory.createParamValuePairValue("integerParam", newIV));
- AnnotationImpl<IMethod> newMethodAnnotation = new AnnotationImpl<IMethod>("org.eclipse.test.MyMethodAnnotation", newIPV);
- newMethodAnnotation.setAppliedElementWithoutSave(firstMethod);
-
- AnnotationWriter.getInstance().update(newMethodAnnotation);
-
- methodAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(firstMethod);
- assertNotNull(methodAnnotations);
- assertTrue(methodAnnotations.size() == 1);
- tempMethodAnnotation = methodAnnotations.iterator().next();
- assertEquals(tempMethodAnnotation.getPropertyValue("integerParam"), "11");
-
- newIV = AnnotationFactory.createIntegerValue("100");
- newIPV = new HashSet<IParamValuePair>();
- newIPV.add(AnnotationFactory.createParamValuePairValue("newestIntegerParam", newIV));
- newMethodAnnotation = new AnnotationImpl<IMethod>("org.eclipse.test.MyMethodAnnotation", newIPV);
- newMethodAnnotation.setAppliedElementWithoutSave(firstMethod);
-
- AnnotationWriter.getInstance().update(newMethodAnnotation);
-
- methodAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(firstMethod);
- assertNotNull(methodAnnotations);
- assertTrue(methodAnnotations.size() == 1);
- tempMethodAnnotation = methodAnnotations.iterator().next();
- assertNull(tempMethodAnnotation.getPropertyValue("integerParam"));
- assertEquals(tempMethodAnnotation.getPropertyValue("newestIntegerParam"), "100");
-
- ITypeParameter typeParameter = firstMethod.getTypeParameter("annotatedParam");
-
- IValue bv = AnnotationFactory.createBooleanValue(true);
- Set<IParamValuePair> bpv = new HashSet<IParamValuePair>();
- bpv.add(AnnotationFactory.createParamValuePairValue("booleanParam", bv));
- IAnnotation<ITypeParameter> parameterAnnotation = AnnotationFactory.createAnnotation("org.eclipse.test.MyParameterAnnotation", bpv, typeParameter);
- AnnotationWriter.getInstance().setAppliedElement(parameterAnnotation, typeParameter);
-
- Collection<IAnnotation<ITypeParameter>> parameterAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter);
- assertNotNull(parameterAnnotations);
- assertTrue(parameterAnnotations.size() == 1);
- IAnnotation<ITypeParameter> tempParameterAnnotation = parameterAnnotations.iterator().next();
- assertEquals(tempParameterAnnotation.getPropertyValue("booleanParam"), "true");
-
- IValue newBV = AnnotationFactory.createBooleanValue(false);
- Set<IParamValuePair> newBPV = new HashSet<IParamValuePair>();
- newBPV.add(AnnotationFactory.createParamValuePairValue("booleanParam", newBV));
- AnnotationImpl<ITypeParameter> newParameterAnnotation = new AnnotationImpl<ITypeParameter>("org.eclipse.test.MyParameterAnnotation", newBPV);
- newParameterAnnotation.setAppliedElementWithoutSave(typeParameter);
-
- AnnotationWriter.getInstance().update(newParameterAnnotation);
-
- parameterAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter);
- assertNotNull(parameterAnnotations);
- assertTrue(parameterAnnotations.size() == 1);
- tempParameterAnnotation = parameterAnnotations.iterator().next();
- assertEquals(tempParameterAnnotation.getPropertyValue("booleanParam"), "false");
-
- newBV = AnnotationFactory.createBooleanValue(true);
- newBPV = new HashSet<IParamValuePair>();
- newBPV.add(AnnotationFactory.createParamValuePairValue("newestBooleanParam", newBV));
- newParameterAnnotation = new AnnotationImpl<ITypeParameter>("org.eclipse.test.MyParameterAnnotation", newBPV);
- newParameterAnnotation.setAppliedElementWithoutSave(typeParameter);
-
- AnnotationWriter.getInstance().update(newParameterAnnotation);
-
- parameterAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter);
- assertNotNull(parameterAnnotations);
- assertTrue(parameterAnnotations.size() == 1);
- tempParameterAnnotation = parameterAnnotations.iterator().next();
- assertNull(tempParameterAnnotation.getPropertyValue("booleanParam"));
- assertEquals(tempParameterAnnotation.getPropertyValue("newestBooleanParam"), "true");
-
-
- }
-
- public void testSetAppliedElementWithoutSave() throws Exception
- {
- setUp();
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- try
- {
- AnnotationWriter.getInstance().setAppliedElement(ann, null);
- fail("NullPointerException was not thrown.");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
- }
-
- public void testMultyAddAnnotation() throws Exception
- {
- setUpWitoutRemove();
-
- IWorkspaceRunnable runnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- try
- {
- Set<String> annoSet = new HashSet<String>();
- annoSet.add("Stateless");
-
- AnnotationFactory.removeAnnotations(endpoint, annoSet);
-
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
-
- IValue sv = AnnotationFactory.createStringValue("StringValue");
-
- Set<IParamValuePair> spv = new HashSet<IParamValuePair>();
- spv.add(AnnotationFactory.createParamValuePairValue("stringParam", sv));
-
- IAnnotation<IType> sAnn = AnnotationFactory.createAnnotation("org.eclipse.test.MyStringAnnotation", spv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(sAnn, endpoint);
-
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(annotations);
- assertTrue(annotations.size() == 3);
- IAnnotation<IType> tmpAnn = annotations.iterator().next();
-
- AnnotationWriter.getInstance().remove(tmpAnn);
-
- annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 2);
-
- IMethod[] methods = endpoint.getMethods();
- for (IMethod method : methods)
- {
- IValue smv = AnnotationFactory.createStringValue("StringValue");
- Set<IParamValuePair> smpv = new HashSet<IParamValuePair>();
- smpv.add(AnnotationFactory.createParamValuePairValue("stringParam", smv));
-
- IAnnotation<IMethod> smAnn = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotationMethod", smpv, method);
- AnnotationWriter.getInstance().setAppliedElement(smAnn, method);
- Collection<IAnnotation<IMethod>> annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertNotNull(annotationsM);
- assertTrue(annotationsM.size() == 2);
-
- annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(annotations);
- assertTrue(annotations.size() == 2);
-
- }
-
- } catch (Exception e)
- {
- fail(e.getMessage());
- }
- }
- };
-
- getTestProject().getSourceFolder().getResource().getWorkspace().run(runnable, null);
-
-
-
-
- }
-
- public void testEquals()
- {
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IType> ann1 = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation1", pv, endpoint);
- IAnnotation<IType> ann2 = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation2", pv, endpoint);
- IAnnotation<IType> ann3 = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation1", pv, endpoint);
-
- assertTrue(ann1.equals(ann1));
- assertFalse(ann1.equals(null));
- assertFalse(ann1.equals(qv));
- assertFalse(ann1.equals(ann2));
- assertTrue(ann1.equals(ann3));
- }
-
- public void testField() throws Exception
- {
- setUp();
-
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IField> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint.getField("field1"));
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint.getField("field1"));
- assertEquals(ann.getAppliedElement(), endpoint.getField("field1"));
- }
-
- public void testLocator() throws Exception
- {
- setUpWitoutRemove2();
-
- IAnnotation<IType> inspectedTypeAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("org.eclipse.demo.MyAnnotation");
- assertNotNull(inspectedTypeAnnotation);
- ILocator locator = inspectedTypeAnnotation.getLocator();
- assertEquals("Unexpected annotation start position", 191, locator.getStartPosition());
- assertEquals("Unexpected length", 33, locator.getLength());
- Set<IParamValuePair> parmValues = inspectedTypeAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("myValue"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected annotation parameter start position", 205, locator.getStartPosition());
- assertEquals("Unexpected annotation parameter length", 18, locator.getLength());
- }
- }
-
- inspectedTypeAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("javax.jws.WebService");
- assertNotNull(inspectedTypeAnnotation);
- locator = inspectedTypeAnnotation.getLocator();
- assertEquals("Unexpected @WebService annotation start position", 226, locator.getStartPosition());
- assertEquals("Unexpected @WebService annotation length", 134, locator.getLength());
- parmValues = inspectedTypeAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("serviceName"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected serviceName annotation parameter start position", 238, locator.getStartPosition());
- assertEquals("Unexpected serviceName annotation parameter length", 31, locator.getLength());
- }
-
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected serviceName annotation parameter start position", 271, locator.getStartPosition());
- assertEquals("Unexpected serviceName annotation parameter length", 17, locator.getLength());
- }
-
- if(paramValuePair.getParam().equals("targetNamespace"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected targetNamespace annotation parameter start position", 290, locator.getStartPosition());
- assertEquals("Unexpected targetNamespace annotation parameter length", 42, locator.getLength());
- }
-
- if(paramValuePair.getParam().equals("portName"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected portName annotation parameter start position", 334, locator.getStartPosition());
- assertEquals("Unexpected portName annotation parameter length", 25, locator.getLength());
- }
- }
-
- IField field = endpoint.getField("field1");
- IAnnotation<IField> inspectedFieldAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(field, "org.eclipse.demo.MyFieldAnnotation");
- locator = inspectedFieldAnnotation.getLocator();
- assertEquals("Unexpected MyFieldAnnotation annotation parameter start position", 401, locator.getStartPosition());
- assertEquals("Unexpected MyFieldAnnotation annotation parameter length", 33, locator.getLength());
- parmValues = inspectedFieldAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 420, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 13, locator.getLength());
- }
- }
-
- inspectedFieldAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(field, "javax.jws.WebField");
- locator = inspectedFieldAnnotation.getLocator();
- assertEquals("Unexpected WebField annotation parameter start position", 437, locator.getStartPosition());
- assertEquals("Unexpected WebField annotation parameter length", 25, locator.getLength());
- parmValues = inspectedFieldAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 447, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 14, locator.getLength());
- }
- }
-
- IMethod method = endpoint.getMethods()[0];
- IAnnotation<IMethod> inspectedMethodAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method, "org.eclipse.demo.MyMethodAnnotation");
- locator = inspectedMethodAnnotation.getLocator();
- assertEquals("Unexpected MyMethodAnnotation annotation parameter start position", 492, locator.getStartPosition());
- assertEquals("Unexpected MyMethodAnnotation annotation parameter length", 43, locator.getLength());
- parmValues = inspectedMethodAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 512, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 22, locator.getLength());
- }
- }
-
- inspectedMethodAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method, "javax.jws.WebMethod");
- locator = inspectedMethodAnnotation.getLocator();
- assertEquals("Unexpected WebMethod annotation parameter start position", 538, locator.getStartPosition());
- assertEquals("Unexpected WebMethod annotation parameter length", 46, locator.getLength());
- parmValues = inspectedMethodAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("exclude"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected exclude annotation parameter start position", 549, locator.getStartPosition());
- assertEquals("Unexpected exclude annotation parameter length", 13, locator.getLength());
- }
-
- if(paramValuePair.getParam().equals("operationName"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected operationName annotation parameter start position", 563, locator.getStartPosition());
- assertEquals("Unexpected operationName annotation parameter length", 20, locator.getLength());
- }
- }
-
- ITypeParameter typeParameter = method.getTypeParameter("annotatedParam");
- IAnnotation<ITypeParameter> inspectedParamAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter, "org.eclipse.demo.MyParamAnnotation");
- locator = inspectedParamAnnotation.getLocator();
- assertEquals("Unexpected MyParamAnnotation annotation parameter start position", 649, locator.getStartPosition());
- assertEquals("Unexpected MyParamAnnotation annotation parameter length", 43, locator.getLength());
- parmValues = inspectedParamAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 668, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 23, locator.getLength());
- }
- }
-
- inspectedParamAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter, "javax.jws.WebParam");
- locator = inspectedParamAnnotation.getLocator();
- assertEquals("Unexpected WebParam annotation parameter start position", 616, locator.getStartPosition());
- assertEquals("Unexpected WebParam annotation parameter length", 32, locator.getLength());
- parmValues = inspectedParamAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 626, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 21, locator.getLength());
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsTest.java
deleted file mode 100755
index 31433a7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationInspectorImpl;
-
-public class AnnotationsTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testAddComplexAnnotationQNValue() throws JavaModelException, AnnotationGeneratorException
- {
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- IParamValuePair pv = AnnotationFactory.createParamValuePairValue("param", qv);
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
- paramValues.add(pv);
- IAnnotation<IType> annotation = AnnotationFactory.createAnnotation("javax.jws.WebService", paramValues, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(annotation, endpoint);
-
- assertTrue(AnnotationFactory.createAnnotationInspector(endpoint).inspectType().size() > 0);
- }
-
-// public void testAddSingleElementAnnotationArrayValues() throws JavaModelException, AnnotationGeneratorException
-// {
-// IAnnotation annotation = AnnotationFactory.createSingleElementAnnotation("javax.jws.WebService", new String[] { "val1", "val2" });
-// annotation.addToClass(endpoint);
-//
-// assertTrue(AnnotationFactory.getAnnotationsFromClass(endpoint).length > 0);
-// }
-//
-// public void testAddSimpleAnnotation() throws JavaModelException, AnnotationGeneratorException
-// {
-// IAnnotation annotation = AnnotationFactory.createSimpleAnnotation("javax.jws.WebService");
-// annotation.addToClass(endpoint);
-//
-// assertTrue(AnnotationFactory.getAnnotationsFromClass(endpoint).length > 0);
-// }
-
- /**
- * Creates complex annotation and adds it to class. The annotation has the form:
- *
- * <pre>
- * @WebService(serviceName="serviceName",
- * name="portTypeName",
- * targetNamespace="http://demo.sap.com/",
- * wsdlLocation="http://wsdl/url/",
- * portName="portName",
- * endpointInterface="org.eclipse.demo.ISei")
- * </pre>
- *
- * @throws JavaModelException
- * @throws AnnotationGeneratorException
- */
- public void testAddComplexClassAnnotation() throws JavaModelException, AnnotationGeneratorException
- {
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
-
- addStringProperty(paramValues, "serviceName", "serviceName");
- addStringProperty(paramValues, "name", "portTypeName");
- addStringProperty(paramValues, "targetNamespace", "http://demo.sap.com/");
- addStringProperty(paramValues, "wsdlLocation", "http://wsdl/url/");
- addStringProperty(paramValues, "portName", "portName");
- addStringProperty(paramValues, "endpointInterface", "org.eclipse.demo.ISei");
-
- IAnnotation<IType> annotation = AnnotationFactory.createAnnotation("javax.jws.WebService", paramValues, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(annotation, endpoint);
-
- AnnotationInspectorImpl annotationInspector = new AnnotationInspectorImpl(endpoint);
- Collection<IAnnotation<IType>> typeAnnotations = annotationInspector.inspectType();
-
- boolean result = false;
- for (IAnnotation<IType> typeAnnotation : typeAnnotations)
- {
- if(typeAnnotation.getAnnotationName().equals("javax.jws.WebService") || typeAnnotation.getAnnotationName().equals("WebService"))
- {
- if(typeAnnotation.getParamValuePairs().size() != 6)
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("serviceName").equals("serviceName"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("name").equals("portTypeName"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("targetNamespace").equals("http://demo.sap.com/"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("wsdlLocation").equals("http://wsdl/url/"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("portName").equals("portName"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("endpointInterface").equals("org.eclipse.demo.ISei"))
- {
- break;
- }
-
- result = true;
- }
- }
-
- assertTrue("Class is not annotated correctly", result);
- }
-
- /**
- * Creates complex annotation and adds it to method declaration. Annotation has the form:
- *
- * <pre>
- * \@WebMethod(exclude=false,operationName="annotatedMethod",action="go")
- * </pre>
- *
- * @throws JavaModelException
- * @throws AnnotationGeneratorException
- */
- public void testAddComplexMethodAnnotation() throws JavaModelException, AnnotationGeneratorException
- {
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
-
- IValue emValue = AnnotationFactory.createBooleanValue(false);
- paramValues.add(AnnotationFactory.createParamValuePairValue("exclude", emValue));
-
- addStringProperty(paramValues, "operationName", "annotatedMethod");
- addStringProperty(paramValues, "action", "go");
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
-
- IAnnotation<IMethod> annotation = AnnotationFactory.createAnnotation("javax.jws.WebMethod", paramValues, method);
- AnnotationWriter.getInstance().setAppliedElement(annotation, method);
-
- AnnotationInspectorImpl annotationInspector = new AnnotationInspectorImpl(endpoint);
- Collection<IAnnotation<IMethod>> methodAnnotations = annotationInspector.inspectMethod(method);
-
- boolean result = false;
- for (IAnnotation<IMethod> methodAnnotation : methodAnnotations)
- {
- if(methodAnnotation.getAnnotationName().equals("javax.jws.WebMethod") || methodAnnotation.getAnnotationName().equals("WebMethod"))
- {
- if(methodAnnotation.getParamValuePairs().size() != 3)
- {
- break;
- }
- if(!methodAnnotation.getPropertyValue("exclude").equals("false"))
- {
- break;
- }
- if(!methodAnnotation.getPropertyValue("operationName").equals("annotatedMethod"))
- {
- break;
- }
- if(!methodAnnotation.getPropertyValue("action").equals("go"))
- {
- break;
- }
-
- result = true;
- }
- }
-
- assertTrue("Method is not annotated correctly", result);
- }
-
- /**
- * Creates complex annotation and adds it to a method parameter. The annotation has the form:
- *
- * <pre>
- * \@WebParam(operationName="annotatedParam", targetNamespace="http://demo.sap.com/params/", partName="partName")
- * </pre>
- *
- * @throws JavaModelException
- * @throws AnnotationGeneratorException
- */
- public void testAddComplexParamAnnotation() throws JavaModelException, AnnotationGeneratorException
- {
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- ITypeParameter typeParameter = method.getTypeParameter("annotatedParam");
-
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
-
- addStringProperty(paramValues, "annotatedParam", "param");
- addStringProperty(paramValues, "targetNamespace", "http://demo.sap.com/params/");
- addStringProperty(paramValues, "partName", "partName");
-
- IAnnotation<ITypeParameter> annotation = AnnotationFactory.createAnnotation("javax.jws.WebParam", paramValues, typeParameter);
- AnnotationWriter.getInstance().setAppliedElement(annotation, typeParameter);
- }
-
- private void addStringProperty(Set<IParamValuePair> paramValues, String property, String value)
- {
- IValue pValue = AnnotationFactory.createStringValue(value);
- IParamValuePair pair = AnnotationFactory.createParamValuePairValue(property, pValue);
- paramValues.add(pair);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ArrayValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ArrayValueImplTest.java
deleted file mode 100755
index bf5e4df..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ArrayValueImplTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ArrayValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-
-public class ArrayValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testHashCode()
- {
- Set<IValue> values1 = new HashSet<IValue>();
- values1.clear();
- values1.add(new StringValueImpl("val1"));
- ArrayValueImpl av1 = new ArrayValueImpl(values1);
-
- Set<IValue> values2 = new HashSet<IValue>();
- values2.clear();
- values2.add(new StringValueImpl("val2"));
- ArrayValueImpl av2 = new ArrayValueImpl(values2);
-
- assertTrue(av1.hashCode() != av2.hashCode());
- }
-
- public void testArrayValueImpl()
- {
- try
- {
- new ArrayValueImpl(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- assertTrue(true);
- }
- }
-
- public void testEqualsObject()
- {
- Set<IValue> values1 = new HashSet<IValue>();
- values1.clear();
- values1.add(new StringValueImpl("val1"));
- ArrayValueImpl av1 = new ArrayValueImpl(values1);
-
- Set<IValue> values2 = new HashSet<IValue>();
- values2.clear();
- values2.add(new StringValueImpl("val2"));
- ArrayValueImpl av2 = new ArrayValueImpl(values2);
-
- Set<IValue> values3 = new HashSet<IValue>();
- values3.clear();
- values3.add(new StringValueImpl("val1"));
- ArrayValueImpl av3 = new ArrayValueImpl(values3);
-
- assertFalse(av1.equals(null));
- assertFalse(av1.equals(123));
- assertFalse(av1.equals(av2));
-
- assertTrue(av1.equals(av3));
- assertTrue(av1.equals(av1));
- }
-
- public void testArrays() throws Exception
- {
- setUp();
-
- Set<IValue> values = new HashSet<IValue>();
- values.clear();
- values.add(new StringValueImpl("val1"));
- values.add(new StringValueImpl("val2"));
- ArrayValueImpl av = new ArrayValueImpl(values);
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", av));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
-
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/BooleanValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/BooleanValueImplTest.java
deleted file mode 100755
index 6dad8ea8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/BooleanValueImplTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ArrayValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.BooleanValueImpl;
-
-public class BooleanValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
-
- public void testBooleanValueImpl()
- {
- try
- {
- new ArrayValueImpl(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- assertTrue(true);
- }
- }
-
- public void testBooleans() throws Exception
- {
- setUp();
-
- BooleanValueImpl bv = new BooleanValueImpl(true);
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", bv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
- }
-
- public void testEqualsObject()
- {
- BooleanValueImpl bv1 = new BooleanValueImpl(true);
- BooleanValueImpl bv2 = new BooleanValueImpl(false);
- BooleanValueImpl bv3 = new BooleanValueImpl(true);
-
- assertFalse(bv1.equals(null));
- assertFalse(bv1.equals(123));
- assertFalse(bv1.equals(bv2));
-
- assertTrue(bv1.equals(bv3));
- assertTrue(bv1.equals(bv1));
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ClassValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ClassValueImplTest.java
deleted file mode 100755
index 2400a28..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ClassValueImplTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ClassValueImpl;
-
-public class ClassValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testIntegers() throws Exception
- {
- setUp();
-
- ClassValueImpl cv = new ClassValueImpl(endpoint.getFullyQualifiedName());
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", cv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- assertEquals(ann.getPropertyValue("param").toString(), endpoint.getFullyQualifiedName());
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
- }
-
- public void testEqualsObject()
- {
- ClassValueImpl cv1 = new ClassValueImpl(endpoint.getFullyQualifiedName());
- ClassValueImpl cv2 = new ClassValueImpl(null);
- ClassValueImpl cv3 = new ClassValueImpl(endpoint.getFullyQualifiedName());
-
- assertFalse(cv1.equals(null));
- assertFalse(cv1.equals(true));
- assertFalse(cv1.equals(cv2));
-
- assertTrue(cv1.equals(cv3));
- assertTrue(cv1.equals(cv1));
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ComplexAnnotationImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ComplexAnnotationImplTest.java
deleted file mode 100755
index 6f56d2d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ComplexAnnotationImplTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.Mock;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class ComplexAnnotationImplTest extends MockObjectTestCase
-{
- private Mock<IType> typeElement = mock(IType.class);
-
- public void testHashCode()
- {
- IValue value = AnnotationFactory.createStringValue("value");
- IParamValuePair pvp = AnnotationFactory.createParamValuePairValue("param", value);
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
- paramValues.add(pvp);
- IAnnotation<IType> annotation1 = AnnotationFactory.createAnnotation("annotationName", paramValues, typeElement.proxy());
- IAnnotation<IType> annotation2 = AnnotationFactory.createAnnotation("annotationName2", paramValues, typeElement.proxy());
-
- assertTrue(annotation1.hashCode() != annotation2.hashCode());
- }
-
- public void testEqualsObject()
- {
- IValue value = AnnotationFactory.createStringValue("value");
- IParamValuePair pvp = AnnotationFactory.createParamValuePairValue("param", value);
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
- paramValues.add(pvp);
- IAnnotation<IType> annotation1 = AnnotationFactory.createAnnotation("annotationName", paramValues, typeElement.proxy());
- IAnnotation<IType> annotation2 = AnnotationFactory.createAnnotation("annotationName2", paramValues, typeElement.proxy());
- IAnnotation<IType> annotation3 = AnnotationFactory.createAnnotation("annotationName", paramValues, typeElement.proxy());
-
- assertFalse(annotation1.equals(annotation2));
- assertFalse(annotation1.equals(null));
- assertFalse(annotation1.equals(123));
- assertTrue(annotation1.equals(annotation3));
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/Endpoint.src b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/Endpoint.src
deleted file mode 100755
index db699b7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/Endpoint.src
+++ /dev/null
@@ -1,15 +0,0 @@
-import java.util.List;
-import java.util.Map;
-
-@WebService(serviceName="WSImplBeanService", name="WSImplBean", targetNamespace="http://demo/eclipse/org/", portName="WSImplBeanPort")
-@Stateless
-public class Endpoint
-{
- @MyAnnotation(name="field1")
- public String field1;
-
- @WebMethod(exclude=false,operationName="test")
- public void annotatedMethod( @WebParam(name="annotatedParam") String annotatedParam)
- {
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/EndpointAnnInspector.src b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/EndpointAnnInspector.src
deleted file mode 100755
index d250d57..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/EndpointAnnInspector.src
+++ /dev/null
@@ -1,22 +0,0 @@
-import java.util.List;
-import java.util.Map;
-import javax.jws.WebService;
-import javax.jws.WebField;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-
-@MyAnnotation(myValue="MyString")
-@WebService(serviceName="WSImplBeanService", name="WSImplBean", targetNamespace="http://demo/eclipse/org/", portName="WSImplBeanPort")
-@Stateless
-public class Endpoint
-{
- @MyFieldAnnotation(name="field1")
- @WebField(name="MyField")
- public String field1;
-
- @MyMethodAnnotation(name="annotatedMethod")
- @WebMethod(exclude=false,operationName="test")
- public void annotatedMethod( @WebParam(name="annotatedParam") @MyParamAnnotation(name="annotatedMyParam") String annotatedParam)
- {
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/IntegerValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/IntegerValueImplTest.java
deleted file mode 100755
index 48d8cc6..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/IntegerValueImplTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.IntegerValueImpl;
-
-public class IntegerValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testIntegers() throws Exception
- {
- setUp();
-
- IntegerValueImpl iv = new IntegerValueImpl("10");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", iv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- assertEquals(ann.getPropertyValue("param").toString(), "10");
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
- }
-
- public void testEqualsObject()
- {
- IntegerValueImpl iv1 = new IntegerValueImpl("10");
- IntegerValueImpl iv2 = new IntegerValueImpl("11");
- IntegerValueImpl iv3 = new IntegerValueImpl("10");
-
- assertFalse(iv1.equals(null));
- assertFalse(iv1.equals(true));
- assertFalse(iv1.equals(iv2));
-
- assertTrue(iv1.equals(iv3));
- assertTrue(iv1.equals(iv1));
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ParamValuePairImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ParamValuePairImplTest.java
deleted file mode 100755
index 32eb628..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ParamValuePairImplTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ParamValuePairImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-
-public class ParamValuePairImplTest extends TestCase
-{
-
- public void testHashCode()
- {
- IValue value = new StringValueImpl("value");
- ParamValuePairImpl pvp = new ParamValuePairImpl("param", value);
-
- IValue value1 = new StringValueImpl("value1");
- ParamValuePairImpl pvp1 = new ParamValuePairImpl("param1", value1);
-
- assertFalse(pvp.hashCode() == pvp1.hashCode());
- assertFalse(pvp.equals(null));
- assertFalse(pvp.equals(123));
- }
-
- public void testEqualsObject()
- {
- IValue value = new StringValueImpl("value");
- ParamValuePairImpl pvp = new ParamValuePairImpl("param", value);
-
- IValue value1 = new StringValueImpl("value");
- ParamValuePairImpl pvp1 = new ParamValuePairImpl("param", value1);
-
- IValue value2 = new StringValueImpl("value2");
- ParamValuePairImpl pvp2 = new ParamValuePairImpl("param2", value2);
-
- assertTrue(pvp.equals(pvp1));
- assertFalse(pvp.equals(pvp2));
- assertTrue(pvp.equals(pvp));
-
- assertFalse(pvp.equals(null));
- assertFalse(pvp.equals(123));
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/QualifiedNameValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/QualifiedNameValueImplTest.java
deleted file mode 100755
index 476119d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/QualifiedNameValueImplTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class QualifiedNameValueImplTest extends TestCase
-{
-
- public void testHashCode()
- {
- IValue qv1 = AnnotationFactory.createQualifiedNameValue("full.qualified.Name1");
- IValue qv2 = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- assertFalse(qv1.hashCode() == qv2.hashCode());
- }
-
- public void testEqualsObject()
- {
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
- IValue qv1 = AnnotationFactory.createQualifiedNameValue("full.qualified.Name1");
- IValue qv2 = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- assertFalse(qv.equals(qv1));
- assertTrue(qv.equals(qv2));
- assertTrue(qv.equals(qv));
- assertFalse(qv.equals(null));
- assertFalse(qv.equals(123));
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/StringValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/StringValueImplTest.java
deleted file mode 100755
index ad19b03..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/StringValueImplTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-
-public class StringValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testIntegers() throws Exception
- {
- setUp();
-
- StringValueImpl sv = new StringValueImpl("10");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", sv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- assertEquals(ann.getPropertyValue("param").toString(), "10");
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
- }
-
- public void testEqualsObject()
- {
- StringValueImpl sv1 = new StringValueImpl("10");
- StringValueImpl sv2 = new StringValueImpl("11");
- StringValueImpl sv3 = new StringValueImpl("10");
-
- assertFalse(sv1.equals(null));
- assertFalse(sv1.equals(true));
- assertFalse(sv1.equals(sv2));
-
- assertTrue(sv1.equals(sv3));
- assertTrue(sv1.equals(sv1));
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/clazz/ASTUtilsTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/clazz/ASTUtilsTest.java
deleted file mode 100755
index 7cd58c3..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/clazz/ASTUtilsTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.clazz;
-
-import java.io.File;
-import java.io.FileWriter;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jst.ws.jaxws.testutils.files.TestFileUtils;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProject;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-
-/**
- * Tests for {@link ASTUtils} class.
- *
- * @author Georgi Vachkov
- */
-public class ASTUtilsTest extends TestCase
-{
- private static final String PCK = "org.eclipse.test";
- private static final String SRC =
- "import javax.xml.namespace.QName;" + "\n" +
- "public class Test {" + "\n" +
- " private final static String name = \"are\";" + "\n" +
- " public Test() {}" + "\n" +
- " public int createInt() {return 0;}" + "\n" +
- "}";
-
- private TestProject project;
-
- public void manualSetUp() throws Exception
- {
- project = new TestProject("JavaProj_" + System.currentTimeMillis());
- project.createSourceFolder("src");
- }
-
- @Override
- public void tearDown() throws Exception
- {
- if (project != null) {
- project.dispose();
- }
- }
-
- public void testCreateASTFileNpe() throws Exception
- {
- try {
- ASTUtils.getInstance().createAST((File)null, null);
- } catch(NullPointerException _) {}
- }
-
- public void testCreateASTFile() throws Exception
- {
- final File tempJavaFile = createTempJavaFile();
- ASTNode node = ASTUtils.getInstance().createAST(tempJavaFile, null);
- assertNotNull(node);
- assertTrue(node instanceof CompilationUnit);
- }
-
- public void testCreateASTITypeNpe() throws Exception
- {
- try {
- ASTUtils.getInstance().createCompilationUnit((ICompilationUnit)null, null);
- } catch(NullPointerException _) {}
- }
-
- public void testCreateASTIType() throws Exception
- {
- manualSetUp();
- final IType sourceType = project.createType(project.createPackage(PCK), "Test.java", SRC);
- ASTNode node = ASTUtils.getInstance().createCompilationUnit(sourceType.getCompilationUnit(), null);
- assertNotNull(node);
- assertTrue(node instanceof CompilationUnit);
- }
-
- public void testGetTypeDeclaration() throws Exception
- {
- manualSetUp();
- final IType sourceType = project.createType(project.createPackage(PCK), "Test.java", SRC);
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(sourceType.getCompilationUnit(), null);
-
- AbstractTypeDeclaration abstractType = ASTUtils.getInstance().getTypeDeclaration("Test", unit);
- assertNotNull(abstractType);
- }
-
- public void testGetTypeDeclarationForInnerType() throws Exception
- {
- manualSetUp();
- String source = "public class Test {" +
- "public static class Parameters {}" +
- "}";
-
- final IType sourceType = project.createType(project.createPackage(PCK), "Test.java", source);
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(sourceType.getCompilationUnit(), null);
-
- AbstractTypeDeclaration abstractType = ASTUtils.getInstance().getTypeDeclaration("Parameters", unit);
- assertNotNull(abstractType);
- }
-
- public void testGetTypeSignatureForSimpleType() throws Exception
- {
- final String varArgSignature = getTypeSignatureForParameter("String p");
- assertFalse("Signature should not start with '['", varArgSignature.toCharArray()[0] == Signature.C_ARRAY);
- }
-
- public void testGetTypeSignatureForArray() throws Exception
- {
- final String varArgSignature = getTypeSignatureForParameter("String[] p");
- assertTrue("Signature should start with '['", varArgSignature.toCharArray()[0] == Signature.C_ARRAY);
- assertFalse("Signature second caharacter must not be '['", varArgSignature.toCharArray()[1] == Signature.C_ARRAY);
- }
-
- public void testGetTypeSignatureForVarArg() throws Exception
- {
- final String varArgSignature = getTypeSignatureForParameter("String... p");
- assertTrue("Signature should start with '['", varArgSignature.toCharArray()[0] == Signature.C_ARRAY);
- assertFalse("Signature second caharacter must not be '['", varArgSignature.toCharArray()[1] == Signature.C_ARRAY);
- }
-
- public void testGetTypeSignatureForMultiDimensionalVarArg() throws Exception
- {
- final String varArgSignature = getTypeSignatureForParameter("String[][]... p");
- assertTrue("Signature should start with '['", varArgSignature.toCharArray()[0] == Signature.C_ARRAY);
- assertTrue("Signature second caharacter must be '['", varArgSignature.toCharArray()[1] == Signature.C_ARRAY);
- assertTrue("Signature third caharacter must be '['", varArgSignature.toCharArray()[2] == Signature.C_ARRAY);
- assertFalse("Signature fourth characted must not be '['", varArgSignature.toCharArray()[3] == Signature.C_ARRAY);
- }
-
- private String getTypeSignatureForParameter(final String paramDefinition) throws Exception
- {
- final ASTUtils astUtils = ASTUtils.getInstance();
-
- manualSetUp();
- String source = "public class Test { public void varArgMethod(" + paramDefinition + "){} }";
-
- final IType sourceType = project.createType(project.createPackage(PCK), "Test.java", source);
- final IMethod varargMethod = sourceType.getMethods()[0];
- assertEquals("Unexpected method name", "varArgMethod", varargMethod.getElementName());
- final CompilationUnit unit = astUtils.createCompilationUnit(sourceType.getCompilationUnit(), null);
- final MethodDeclaration methodDecl = astUtils.getMethodDeclaration(varargMethod, (TypeDeclaration) astUtils.getTypeDeclaration("Test", unit));
- assertEquals("One parameter expected", 1, methodDecl.parameters().size());
-
- return astUtils.getTypeSignature((SingleVariableDeclaration) methodDecl.parameters().iterator().next());
- }
-
- private File createTempJavaFile() throws Exception
- {
- File dir = TestFileUtils.createTempDirectory("" + System.currentTimeMillis());
- File tempClassFile = new File(dir, "Test.java");
- FileWriter fw = new FileWriter(tempClassFile);
- fw.write("package " + PCK + ";\n" + SRC);
- fw.close();
-
- return tempClassFile;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/mock/EndpointFormat.src b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/mock/EndpointFormat.src
deleted file mode 100755
index 7bf6fb8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/mock/EndpointFormat.src
+++ /dev/null
@@ -1 +0,0 @@
-public class Endpoint{public Endpoint(){}public void useVoid(){}public String echoString(String s){return s}}
\ No newline at end of file
diff --git a/tests/org.jmock/.classpath b/tests/org.jmock/.classpath
deleted file mode 100755
index aee050d..0000000
--- a/tests/org.jmock/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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 exported="true" kind="lib" path="lib/jmock-core-1.2.0.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.jmock/.project b/tests/org.jmock/.project
deleted file mode 100755
index 63f6b47..0000000
--- a/tests/org.jmock/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jmock</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.jmock/.settings/org.eclipse.jdt.core.prefs b/tests/org.jmock/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index c611078..0000000
--- a/tests/org.jmock/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Jun 23 18:41:55 EEST 2009
-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.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.jmock/META-INF/MANIFEST.MF b/tests/org.jmock/META-INF/MANIFEST.MF
deleted file mode 100755
index c1e3479..0000000
--- a/tests/org.jmock/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.junit;visibility:=reexport
-Export-Package: org.jmock,
- org.jmock.builder,
- org.jmock.core,
- org.jmock.core.constraint,
- org.jmock.core.matcher,
- org.jmock.core.stub,
- org.jmock.expectation,
- org.jmock.util
-Bundle-Vendor: org.jmock
-Bundle-ClassPath: lib/jmock-core-1.2.0.jar
-Bundle-Version: 1.2.0
-Eclipse-BuddyPolicy: global
-Bundle-Name: JMock
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.jmock;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/tests/org.jmock/about.html b/tests/org.jmock/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.jmock/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</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
-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.jmock/build.properties b/tests/org.jmock/build.properties
deleted file mode 100755
index 13a8fc6..0000000
--- a/tests/org.jmock/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = lib/,\
- META-INF/,\
- build.properties
diff --git a/tests/org.jmock/lib/jmock-core-1.2.0.jar b/tests/org.jmock/lib/jmock-core-1.2.0.jar
deleted file mode 100755
index b9d317f..0000000
--- a/tests/org.jmock/lib/jmock-core-1.2.0.jar
+++ /dev/null
Binary files differ
