This commit was manufactured by cvs2svn to create tag 'v200904231745'.
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.classpath b/bundles/org.eclipse.jst.ws.annotations.core/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.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.annotations.core/.project b/bundles/org.eclipse.jst.ws.annotations.core/.project
deleted file mode 100644
index 133e566..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.annotations.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.annotations.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6ee33b2..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Mar 09 20:36:45 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.annotations.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 7c7eb5a..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.annotations.core;singleton:=true
-Bundle-Version: 0.5.1.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %pluginProvider
-Eclipse-BuddyPolicy: registered
-Require-Bundle: org.eclipse.jdt.core,
- org.eclipse.jface.text,
- org.eclipse.core.runtime,
- org.eclipse.core.filebuffers,
- org.eclipse.core.resources,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ui,
- org.eclipse.jdt.apt.core,
- org.eclipse.jdt.ui;bundle-version="3.4.1"
-Export-Package: org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.annotations.core.initialization,
- org.eclipse.jst.ws.annotations.core.processor,
- org.eclipse.jst.ws.annotations.core.utils
-Bundle-Activator: org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/about.html b/bundles/org.eclipse.jst.ws.annotations.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.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.annotations.core/build.properties b/bundles/org.eclipse.jst.ws.annotations.core/build.properties
deleted file mode 100644
index 921a77d..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- schema/,\
- plugin.properties,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties b/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties
deleted file mode 100644
index 3d2b55c..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/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
-###############################################################################
-
-#properties file for Annotations Core
-pluginName= Annotations Core (Incubation)
-pluginProvider=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml b/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml
deleted file mode 100644
index ac23fee..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension-point id="annotationCategory" name="Annotation Category" schema="schema/annotationCategory.exsd"/>
- <extension-point id="annotationDefinition" name="Annotation Definition" schema="schema/annotationDefinition.exsd"/>
- <extension-point id="annotationInitializer" name="Annotation Initializer" schema="schema/annotationInitializer.exsd"/>
- <extension-point id="annotationProcessor" name="Annotation Processor" schema="schema/annotationProcessor.exsd"/>
-
- <extension point="org.eclipse.jdt.apt.core.annotationProcessorFactory">
- <factories enableDefault="true">
- <factory
- class="org.eclipse.jst.ws.internal.annotations.core.processor.AnnotationsCoreProcessorFactory">
- </factory>
- </factories>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
deleted file mode 100644
index cf6b301..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationCategory" name="Annotation Category"/>
- </appinfo>
- <documentation>
- This extension point is used to contribute an annotation category.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="category" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="category">
- <annotation>
- <documentation>
- An annotation category contribution defines categories of annotations used to group them in the UI.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- a unique identifier for the annotation category.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A uniqure annotation cateogory name.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- The following is an example of an annotation category contribution:
-
-<p>
-<pre>
- <extension point="org.eclipse.jst.ws.annotations.core.annotationCategory">
- <category
- id="jaxws.category"
- name="JAX-WS">
- </category>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2009 Shane Clarke. <br>
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at <ahref="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
deleted file mode 100644
index 34c1749..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationDefinition" name="Annotation Definition"/>
- </appinfo>
- <documentation>
- This extension point allows clients to contribute annotations <? extends java.lang.annotation.Annotation> which are in turn consumed by the UI.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="0" maxOccurs="unbounded">
- <element ref="annotation" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="annotation">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the fully qualified annotation class name that extends <code>java.lang.annotation.Annotation</code>
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn="java.lang.annotation.Annotation:"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="category" type="string" use="required">
- <annotation>
- <documentation>
- the id of a <tt>annotationCategory</tt>
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationCategory/category/@id"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The simple name of the annotation class.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="restrictedTo">
- <annotation>
- <documentation>
- Used in addition to the java.lang.annotation.ElementType (s) that are specifed in the @TARGET on the contributed annotation to further restrict visiblity in the UI.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="CLASS_ONLY">
- </enumeration>
- <enumeration value="INTERFACE_ONLY">
- </enumeration>
- <enumeration value="ENUM_ONLY">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- The following is an example of an annotation definition contribution:
-
-<p>
-<pre>
- <extension point="org.eclipse.jst.ws.annotations.core.annotationDefinition">
- <annotation
- category="jaxws.category"
- class="javax.jws.WebService"
- name="WebService">
- </annotation>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2009 Shane Clarke. <br>
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
deleted file mode 100644
index 795fb55..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationInitializer" name="Annotation Initializer"/>
- </appinfo>
- <documentation>
- This extension point allows clients to associate an annotation initializer with a contribute annotation definition.
-
-The annotation initializers role is to construct values for the annotations member value pairs.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="0" maxOccurs="unbounded">
- <element ref="initializer" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="initializer">
- <complexType>
- <attribute name="annotation" type="string" use="required">
- <annotation>
- <documentation>
- the class name of the annotation definition that this initializers handles.
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationDefinition/annotation/@class"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the name of the class that implements the contributed initializer. The
-class must be a public and extend
-<code>org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer</code> with a public 0-argument constructor.
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer:"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- The following is an example of an annotation initializer contribution:
-
-<p>
-<pre>
- <extension point="org.eclipse.jst.ws.annotations.core.annotationInitializer">
- <initializer
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebServiceAttributeInitializer">
- </initializer>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2009 Shane Clarke. <br>
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
deleted file mode 100644
index 249646c..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationProcessor" name="Annotation Processor"/>
- </appinfo>
- <documentation>
- This extension point allows clients to contribute annotation procesoors. These processors are associated with contributed annotation definitions.
-
-The goal of the processor is to validate annotation rules.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="0" maxOccurs="unbounded">
- <element ref="processor" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="processor">
- <complexType>
- <sequence>
- <element ref="description" minOccurs="0" maxOccurs="1"/>
- </sequence>
- <attribute name="annotation" type="string" use="required">
- <annotation>
- <documentation>
- the class name of the annotation definition that this processor handles.
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationDefinition/annotation/@class"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the name of the class that implements the contributed procesor. The
-class must be a public subclass of
-<code>org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor</code>and must have a public 0-argument constructor.
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor:"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="description" type="string">
- <annotation>
- <documentation>
- An optional attribute to hold a short text describing what "rule" the processor handles.
- </documentation>
- </annotation>
- </element>
-
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- The following is an example of an annotation processor contribution:
-
-<p>
-<pre>
- <extension point="org.eclipse.jst.ws.annotations.core.annotationProcessor">
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceSEIPresentNoWebMethodRule">
- <description>
- %WEBSERVICE_SEI_NO_WEBMETHOS_RULE
- </description>
- </processor>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2009 Shane Clarke. <br>
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
deleted file mode 100644
index e054320..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.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.annotations.core;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-
-/**
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- */
-public class AnnotationDefinition {
- private static final String ATT_CLASS = "class"; //$NON-NLS-1$
- private static final String ATT_NAME = "name"; //$NON-NLS-1$
- private static final String ATT_RESTRICTED_TO = "restrictedTo"; //$NON-NLS-1$
-
- private static final String RESTRICTED_TO_CLASS_ONLY = "CLASS_ONLY";
- private static final String RESTRICTED_TO_INTERFACE_ONLY = "INTERFACE_ONLY";
- private static final String RESTRICTED_TO_ENUM_ONLY = "ENUM_ONLY";
-
- private String category;
- private String annotationClassName;
- private Class<? extends java.lang.annotation.Annotation> annotationClass;
- private List<ElementType> targets;
- private String name;
- private IAnnotationAttributeInitializer annotationInitializer;
- private String restictedTo;
- private boolean interfaceOnly;
- private boolean classOnly;
- private boolean enumOnly;
-
- public AnnotationDefinition(IConfigurationElement configurationElement, String category) {
- this.category = category;
- this.annotationClassName = AnnotationsManager.getAttributeValue(configurationElement, ATT_CLASS);
- this.name = AnnotationsManager.getAttributeValue(configurationElement, ATT_NAME);
- this.restictedTo = AnnotationsManager.getAttributeValue(configurationElement,
- ATT_RESTRICTED_TO);
- this.classOnly = restictedTo.equals(RESTRICTED_TO_CLASS_ONLY);
- this.interfaceOnly = restictedTo.equals(RESTRICTED_TO_INTERFACE_ONLY);
- this.enumOnly = restictedTo.equals(RESTRICTED_TO_ENUM_ONLY);
- }
-
- public String getName() {
- return name;
- }
-
- public String getCategory() {
- return category;
- }
-
- public String getAnnotationClassName() {
- return annotationClassName;
- }
-
- public boolean isClassOnly() {
- return classOnly;
- }
-
- public boolean isInterfaceOnly() {
- return interfaceOnly;
- }
-
- public boolean isEnumOnly() {
- return enumOnly;
- }
-
- @SuppressWarnings("unchecked")
- public Class<? extends java.lang.annotation.Annotation> getAnnotationClass() {
- if (annotationClass == null) {
- try {
- Class<?> aClass = Class.forName(annotationClassName);
- if (aClass.isAnnotation()) {
- annotationClass = (Class<java.lang.annotation.Annotation>)Class.forName(
- annotationClassName);
- }
- } catch(ClassNotFoundException cnfe) {
- AnnotationsCorePlugin.log(cnfe);
- }
- }
- return annotationClass;
- }
-
- public List<ElementType> getTargets() {
- if (targets == null) {
- Class<? extends java.lang.annotation.Annotation> annotation = getAnnotationClass();
- Target target = annotation.getAnnotation(Target.class);
- if (target != null) {
- targets = Arrays.asList(target.value());
- } else {
- targets = Collections.emptyList();
- }
- }
- return targets;
- }
-
- public IAnnotationAttributeInitializer getAnnotationAttributeInitializer() {
- if (annotationInitializer == null) {
- try {
- IConfigurationElement configurationElement =
- AnnotationsManager.getAnnotationInitializerCache().get(getAnnotationClassName());
- if (configurationElement != null) {
- annotationInitializer = (IAnnotationAttributeInitializer)configurationElement
- .createExecutableExtension(ATT_CLASS);
- }
- } catch (CoreException ce) {
- AnnotationsCorePlugin.log(ce.getStatus());
- }
- }
- return annotationInitializer;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java
deleted file mode 100644
index a285358..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java
+++ /dev/null
@@ -1,270 +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.annotations.core;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-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.dom.AST;
-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.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.SimpleName;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-/**
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- */
-public final class AnnotationsCore {
-
- private AnnotationsCore() {
- }
-
- public static Annotation createAnnotation(AST ast,
- Class<? extends java.lang.annotation.Annotation> annotationClass,
- String annotationName,
- List<MemberValuePair> memberValuePairs) {
-
- NormalAnnotation annotation = ast.newNormalAnnotation();
-
- Name annotationTypeName = ast.newName(annotationName);
-
- annotation.setTypeName(annotationTypeName);
-
- if (memberValuePairs != null) {
- for (MemberValuePair memberValuePair : memberValuePairs) {
- @SuppressWarnings("unchecked")
- List<MemberValuePair> annotationValues = annotation.values();
- annotationValues.add(memberValuePair);
- }
- }
- return annotation;
- }
-
- public static MemberValuePair createMemberValuePair(AST ast, String name, Expression expression) {
- MemberValuePair memberValuePair = ast.newMemberValuePair();
- memberValuePair.setName(ast.newSimpleName(name));
- memberValuePair.setValue(expression);
- return memberValuePair;
- }
-
-
- public static MemberValuePair createStringMemberValuePair(AST ast, String name, Object value) {
- MemberValuePair stringMemberValuePair = AnnotationsCore.createMemberValuePair(ast, name,
- AnnotationsCore.createStringLiteral(ast, value.toString()));
-
- return stringMemberValuePair;
- }
-
- public static MemberValuePair createBooleanMemberValuePair(AST ast, String name, Object value) {
- MemberValuePair booleanValuePair = AnnotationsCore.createMemberValuePair(ast, name, AnnotationsCore
- .createBooleanLiteral(ast, ((Boolean)value).booleanValue()));
-
- return booleanValuePair;
- }
-
- public static MemberValuePair createNumberMemberValuePair(AST ast, String name, Object value) {
- MemberValuePair primitiveValuePair = AnnotationsCore.createMemberValuePair(ast, name,
- AnnotationsCore.createNumberLiteral(ast, value.toString()));
- return primitiveValuePair;
- }
-
- public static MemberValuePair createEnumMemberValuePair(AST ast, String className, String name,
- Object value) {
- return AnnotationsCore.createMemberValuePair(ast, name, createEnumLiteral(ast, className, value));
- }
-
- public static MemberValuePair createTypeMemberVaulePair(AST ast, String name, Object value) {
- return AnnotationsCore.createMemberValuePair(ast, name,
- createTypeLiteral(ast, value));
- }
-
- public static MemberValuePair createArrayMemberValuePair(AST ast, Method method, Object[] values) {
- return AnnotationsCore.createMemberValuePair(ast, method.getName(), createArrayValueLiteral(ast,
- method, values));
- }
-
- @SuppressWarnings("unchecked")
- public static ArrayInitializer createArrayValueLiteral(AST ast, Method method, Object[] values) {
- ArrayInitializer arrayInitializer = ast.newArrayInitializer();
- for (Object value : values) {
- if (value instanceof java.lang.annotation.Annotation) {
- //TODO Handle this situation. Arises when annotations are specified as defaults in array initializers
- }
- 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 = (Map<String, Object>) 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(createStringMemberValuePair(ast, memberName,
- memberValue));
- }
- if (returnType.equals(Boolean.TYPE)) {
- memberValuePairs.add(createBooleanMemberValuePair(ast, memberName,
- 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,
- 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(createAnnotation(ast, annotationClass,
- annotationClass.getCanonicalName(), memberValuePairs));
- }
- if (value.equals(Class.class)) {
- arrayInitializer.expressions().add(createTypeLiteral(ast, value.toString()));
- }
- if (value instanceof String) {
- String stringValue = value.toString();
- if (stringValue.endsWith(".class")) {
- arrayInitializer.expressions().add(createTypeLiteral(ast, stringValue.substring(0,
- stringValue.lastIndexOf("."))));
- } else {
- arrayInitializer.expressions().add(createStringLiteral(ast, stringValue));
- }
- }
- }
- return arrayInitializer;
- }
-
- public static Name createEnumLiteral(AST ast, String className, Object value) {
- QualifiedName enumName = null;
- SimpleName enumClassName = ast.newSimpleName(value.getClass().getSimpleName());
- SimpleName enumLiteral = ast.newSimpleName(value.toString());
- if (value.getClass().isMemberClass()) {
- Name enumEnclosingClassName = null;
- String enclosingClassName = value.getClass().getEnclosingClass().getCanonicalName();
- if (enclosingClassName.equals(className)) {
- enumEnclosingClassName = ast.newSimpleName(value.getClass().getEnclosingClass()
- .getSimpleName());
- } else {
- enumEnclosingClassName = ast.newName(enclosingClassName);
- }
- QualifiedName qualifiedName = ast.newQualifiedName(enumEnclosingClassName, enumClassName);
- enumName = ast.newQualifiedName(qualifiedName, enumLiteral);
- } else {
- Name qualifiedName = ast.newName(value.getClass().getCanonicalName());
- enumName = ast.newQualifiedName(qualifiedName, enumLiteral);
- }
- return enumName;
- }
-
- public static TypeLiteral createTypeLiteral(AST ast, Object value) {
- TypeLiteral typeLiteral = null;
- if (value instanceof Class) {
- typeLiteral = createTypeLiteral(ast, (Class<?>) value);
- }
- if (value instanceof String) {
- typeLiteral = createTypeLiteral(ast, (String) value);
- }
- return typeLiteral;
- }
-
- public static TypeLiteral createTypeLiteral(AST ast, Class<?> value) {
- TypeLiteral typeLiteral = ast.newTypeLiteral();
-
- Class<?> aClass = (Class<?>)value;
- SimpleName className = ast.newSimpleName(aClass.getSimpleName());
-
- if (aClass.isMemberClass()) {
- Name enclosingClassName = ast.newName(aClass.getEnclosingClass().getCanonicalName());
- QualifiedType qualifiedType = ast.newQualifiedType(ast.newSimpleType(enclosingClassName), className);
- typeLiteral.setType(qualifiedType);
- return typeLiteral;
- }
- return createTypeLiteral(ast, value.getCanonicalName());
- }
-
- public static TypeLiteral createTypeLiteral(AST ast, String value) {
- TypeLiteral typeLiteral = ast.newTypeLiteral();
-
- if (value.toString().indexOf(".") == -1) { //$NON-NLS-1$
- typeLiteral.setType(ast.newSimpleType(ast.newSimpleName(value.toString())));
- } else {
- String qualifier = value.toString().substring(0, value.toString().lastIndexOf(".")); //$NON-NLS-1$
- String identifier = value.toString().substring(value.toString().lastIndexOf(".") + 1); //$NON-NLS-1$
- if (qualifier.equals("java.lang")) { //$NON-NLS-1$
- typeLiteral.setType(ast.newSimpleType(ast.newSimpleName(identifier)));
- } else {
- typeLiteral.setType(ast.newQualifiedType(ast.newSimpleType(ast.newName(qualifier)), ast
- .newSimpleName(identifier)));
- }
- }
- return typeLiteral;
- }
-
- public static StringLiteral createStringLiteral(AST ast, String literalValue) {
- StringLiteral stringLiteral = ast.newStringLiteral();
- stringLiteral.setLiteralValue(literalValue);
- return stringLiteral;
- }
-
- public static BooleanLiteral createBooleanLiteral(AST ast, boolean value) {
- BooleanLiteral booleanLiteral = ast.newBooleanLiteral(value);
- return booleanLiteral;
- }
-
- public static NumberLiteral createNumberLiteral(AST ast, String value) {
- NumberLiteral primitiveLiteral = ast.newNumberLiteral();
- primitiveLiteral.setToken(value);
- return primitiveLiteral;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.java
deleted file mode 100644
index 84ff919..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.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.annotations.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- *
- */
-public class AnnotationsCorePlugin extends Plugin {
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.annotations.core"; //$NON-NLS-1$
-
- // The shared instance
- private static AnnotationsCorePlugin plugin;
-
- public static AnnotationsCorePlugin 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) {
- AnnotationsCorePlugin.log(new Status(severity, AnnotationsCorePlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- AnnotationsCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- AnnotationsCorePlugin.log(new Status(IStatus.ERROR, AnnotationsCorePlugin.PLUGIN_ID, exception
- .getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java
deleted file mode 100644
index 8256ac4..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java
+++ /dev/null
@@ -1,432 +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.annotations.core;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-
-/**
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- */
-public final class AnnotationsManager {
- public static final String ANNOTATION_DEFINITION = "annotationDefinition"; //$NON-NLS-1$
- public static final String ANNOTATION_CATEGORY = "annotationCategory"; //$NON-NLS-1$
- public static final String ANNOTATION_INITIALIZER = "annotationInitializer"; //$NON-NLS-1$
- public static final String ANNOTATION_PROCESSOR = "annotationProcessor"; //$NON-NLS-1$
- public static final String ANNOTATION = "annotation"; //$NON-NLS-1$
-
- private static List<AnnotationDefinition> annotationCache = null;
- private static Map<String, String> annotationCategoryCache = null;
- private static Map<String, IConfigurationElement> annotationInitializerCache = null;
- private static Map<String, List<IConfigurationElement>> annotationProcessorCache = null;
- private static Map<String, List<AnnotationDefinition>> annotationsByCategoryMap = null;
- private static Map<Class<? extends Annotation>, AnnotationDefinition> annotationClassToDefinitionMap;
- private static Map<String, AnnotationDefinition> annotationSimpleNameToDefinitionMap;
- private static Map<String, AnnotationDefinition> annotationQualifiedNameToDefinitionMap;
-
-
- private static final String ATT_ID = "id"; //$NON-NLS-1$
- private static final String ATT_NAME = "name"; //$NON-NLS-1$
- private static final String ATT_CATEGORY = "category"; //$NON-NLS-1$
-
- private AnnotationsManager() {
- }
-
- public static synchronized List<AnnotationDefinition> getAnnotations() {
- if (annotationCache == null) {
- annotationCache = new ArrayList<AnnotationDefinition>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_DEFINITION);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- if (element.getName().equals(ANNOTATION)) {
- AnnotationDefinition annotationDefinition = new AnnotationDefinition(element,
- getAnnotationCategory(getAttributeValue(element, ATT_CATEGORY)));
- annotationCache.add(annotationDefinition);
- }
- }
- }
- }
- return annotationCache;
- }
-
- public static Object[] getAnnotations(Object element) {
- List<Class<? extends Annotation>> annotations = new ArrayList<Class<? extends Annotation>>();
-
- try {
- List<AnnotationDefinition> annotationDefinitions = getAllAnnotationsForElement(element);
-
- filterAnnotationsList(element, annotationDefinitions);
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- annotations.add(annotationDefinition.getAnnotationClass());
- }
- } catch (JavaModelException jme) {
- AnnotationsCorePlugin.log(jme.getStatus());
- }
- return annotations.toArray();
- }
-
- private static synchronized Map<Class<? extends Annotation>, AnnotationDefinition>
- getAnnotationToClassDefinitionMap() {
-
- if (annotationClassToDefinitionMap == null) {
- List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
- annotationClassToDefinitionMap = new HashMap<Class<? extends Annotation>, AnnotationDefinition>();
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- annotationClassToDefinitionMap.put(annotationDefinition.getAnnotationClass(),
- annotationDefinition);
- }
- }
- return annotationClassToDefinitionMap;
- }
-
- private static synchronized Map<String, AnnotationDefinition> getSimpleNameToDefinitionMap() {
- if (annotationSimpleNameToDefinitionMap == null) {
- List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
- annotationSimpleNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- annotationSimpleNameToDefinitionMap.put(annotationDefinition.getName(), annotationDefinition);
- }
- }
- return annotationSimpleNameToDefinitionMap;
- }
-
- private static synchronized Map<String, AnnotationDefinition> getQualifiedNameToDefinitionMap() {
- if (annotationQualifiedNameToDefinitionMap == null) {
- List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
- annotationQualifiedNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- annotationQualifiedNameToDefinitionMap.put(annotationDefinition.getAnnotationClassName(),
- annotationDefinition);
- }
- }
- return annotationQualifiedNameToDefinitionMap;
- }
-
- @SuppressWarnings("unchecked")
- public static AnnotationDefinition getAnnotationDefinitionForClass(Object element) {
- if (element instanceof Class && ((Class<?>)element).isAnnotation()) {
- return getAnnotationToClassDefinitionMap().get((Class<? extends Annotation>)element);
- }
- return null;
- }
-
- public static IAnnotationAttributeInitializer getAnnotationAttributeInitializerForName(Name name) {
- if (name != null) {
- if (name.isSimpleName()) {
- return getSimpleNameToDefinitionMap().get(((SimpleName)name).getIdentifier())
- .getAnnotationAttributeInitializer();
- } else if (name.isQualifiedName()) {
- return getQualifiedNameToDefinitionMap().get(name.getFullyQualifiedName())
- .getAnnotationAttributeInitializer();
- }
- }
- return null;
- }
-
- public static AnnotationDefinition getAnnotationDefinitionForClass(Class<? extends Annotation>
- annotationClass) {
- return getAnnotationToClassDefinitionMap().get(annotationClass);
- }
-
- public static synchronized List<AnnotationDefinition> getAnnotationsByCategory(String categoryName) {
- if (annotationsByCategoryMap == null) {
- annotationsByCategoryMap = new HashMap<String, List<AnnotationDefinition>>();
- for (AnnotationDefinition annotationDefinition : getAnnotations()) {
-
- List<AnnotationDefinition> annotationDefinitionList = annotationsByCategoryMap.get(
- annotationDefinition.getCategory());
-
- if (annotationDefinitionList == null) {
- annotationDefinitionList = new ArrayList<AnnotationDefinition>();
- annotationDefinitionList.add(annotationDefinition);
- annotationsByCategoryMap.put(annotationDefinition.getCategory(), annotationDefinitionList);
- continue;
- }
- annotationDefinitionList.add(annotationDefinition);
- }
- }
- return annotationsByCategoryMap.get(categoryName);
- }
-
- public static List<String> getAnnotationCategories() {
- return Arrays.asList(getAnnotationCategoryCache().values().toArray(
- new String[getAnnotationCategoryCache().size()]));
- }
-
- public static String getAnnotationCategory(String categoryId) {
- return getAnnotationCategoryCache().get(categoryId);
- }
-
- private static synchronized Map<String, String> getAnnotationCategoryCache() {
- if (annotationCategoryCache != null) {
- return annotationCategoryCache;
- }
-
- annotationCategoryCache = new HashMap<String, String>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_CATEGORY);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- annotationCategoryCache.put(getAttributeValue(element, ATT_ID),
- getAttributeValue(element, ATT_NAME));
- }
- }
- return annotationCategoryCache;
- }
-
- public static synchronized Map<String, IConfigurationElement> getAnnotationInitializerCache() {
- if (annotationInitializerCache != null) {
- return annotationInitializerCache;
- }
-
- annotationInitializerCache = new HashMap<String, IConfigurationElement>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_INITIALIZER);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- annotationInitializerCache.put(getAttributeValue(element, ANNOTATION),
- element);
- }
- }
- return annotationInitializerCache;
- }
-
- public static synchronized Map<String, List<IConfigurationElement>> getAnnotationProcessorsCache() {
- if (annotationProcessorCache == null) {
- annotationProcessorCache = new HashMap<String, List<IConfigurationElement>>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_PROCESSOR);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- if (element.getName().equalsIgnoreCase("processor")) {
- String annotationKey = getAttributeValue(element, ANNOTATION);
- List<IConfigurationElement> configurationElements = annotationProcessorCache.get(annotationKey);
- if (configurationElements == null) {
- configurationElements = new ArrayList<IConfigurationElement>();
- configurationElements.add(element);
- annotationProcessorCache.put(annotationKey, configurationElements);
- continue;
- }
- configurationElements.add(element);
- }
- }
- }
- }
- return annotationProcessorCache;
- }
-
- public static String getAttributeValue(IConfigurationElement configurationElement, String attributeName) {
- String attribute = configurationElement.getAttribute(attributeName);
- if (attribute != null) {
- return attribute;
- }
- return ""; //$NON-NLS-1$
- }
-
- private static List<AnnotationDefinition> getAllAnnotationsForElement(Object element)
- throws JavaModelException {
-
- if (element instanceof IPackageDeclaration) {
- return getAnnotationsForElementType(ElementType.PACKAGE);
- }
-
- if (element instanceof IType) {
- IType type = (IType) element;
- if (type.isAnnotation()) {
- return getAnnotationsForElementType(ElementType.ANNOTATION_TYPE);
- }
- return getAnnotationsForElementType(ElementType.TYPE);
- }
-
- if (element instanceof IField) {
- return getAnnotationsForElementType(ElementType.FIELD);
- }
-
- if (element instanceof IMethod) {
- return getAnnotationsForElementType(ElementType.METHOD);
- }
-
- if (element instanceof SingleVariableDeclaration) {
- return getAnnotationsForElementType(ElementType.PARAMETER);
- }
-
- if (element instanceof ILocalVariable) {
- return getAnnotationsForElementType(ElementType.LOCAL_VARIABLE);
- }
-
- if (element instanceof IAnnotation) {
- return getAnnotationsForElementType(ElementType.ANNOTATION_TYPE);
- }
-
- return Collections.emptyList();
- }
-
- private static List<AnnotationDefinition> getAnnotationsForElementType(ElementType elementType) {
- List<AnnotationDefinition> annotationDefinitions = new ArrayList<AnnotationDefinition>();
-
- if (annotationCache == null) {
- getAnnotations();
- }
-
- for (AnnotationDefinition annotationDefinition : annotationCache) {
- if (annotationDefinition.getTargets().contains(elementType) &&
- !isDeprecated(annotationDefinition)) {
- annotationDefinitions.add(annotationDefinition);
- }
- }
- return annotationDefinitions;
- }
-
- private static void filterAnnotationsList(Object element,
- List<AnnotationDefinition> annotationDefinitions) throws JavaModelException {
- Iterator<AnnotationDefinition> annotationIter = annotationDefinitions.iterator();
- while (annotationIter.hasNext()) {
- AnnotationDefinition annotationDefinition = annotationIter.next();
-
- if (element instanceof IType) {
- IType type = (IType) element;
- if (isClassRestricted(type, annotationDefinition)
- || isInterfaceRestricted(type, annotationDefinition)
- || isEnumRestricted(type, annotationDefinition)) {
- annotationIter.remove();
- }
- }
- if (element instanceof IMethod) {
- IMethod method = (IMethod) element;
- if (method.isMainMethod()) {
- annotationIter.remove();
- }
- if (method.isConstructor()
- && !annotationDefinition.getTargets().contains(ElementType.CONSTRUCTOR)) {
- annotationIter.remove();
- }
-
- if (isClassRestricted(method, annotationDefinition)
- || isInterfaceRestricted(method, annotationDefinition)
- || isEnumRestricted(method, annotationDefinition)) {
- annotationIter.remove();
- }
- }
-
- if (element instanceof IField) {
- if(isClassRestricted((IField) element, annotationDefinition)
- || isInterfaceRestricted((IField) element, annotationDefinition)
- ||isEnumRestricted((IField) element, annotationDefinition)) {
- annotationIter.remove();
- }
- }
- }
- }
-
- private static boolean isClassRestricted(IJavaElement javaElement, AnnotationDefinition annotationDefinition)
- throws JavaModelException {
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- return !((IType)javaElement).isClass() && annotationDefinition.isClassOnly();
- }
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IType type = (IType)javaElement.getParent();
- return !type.isClass() && annotationDefinition.isClassOnly();
- }
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IType type = (IType)javaElement.getParent();
- return !type.isClass() && annotationDefinition.isClassOnly();
- }
- return false;
- }
-
- private static boolean isInterfaceRestricted(IJavaElement javaElement, AnnotationDefinition annotationDefinition)
- throws JavaModelException {
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- return !((IType)javaElement).isInterface() && annotationDefinition.isInterfaceOnly();
- }
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IType type = (IType)javaElement.getParent();
- return !type.isInterface() && annotationDefinition.isInterfaceOnly();
- }
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IType type = (IType)javaElement.getParent();
- return !type.isInterface() && annotationDefinition.isInterfaceOnly();
- }
- return false;
- }
-
- private static boolean isEnumRestricted(IJavaElement javaElement, AnnotationDefinition annotationDefinition)
- throws JavaModelException {
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- return !((IType)javaElement).isEnum() && annotationDefinition.isEnumOnly();
- }
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IType type = (IType)javaElement.getParent();
- return !type.isEnum() && annotationDefinition.isEnumOnly();
- }
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IType type = (IType)javaElement.getParent();
- return !type.isEnum() && annotationDefinition.isEnumOnly();
- }
- return false;
- }
-
- //TODO Move the Deprecated option to preferences
- private static boolean isDeprecated(AnnotationDefinition annotationDefinition) {
- Class<?> annotationClass = annotationDefinition.getAnnotationClass();
- return annotationClass.getAnnotation(java.lang.Deprecated.class) != null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java
deleted file mode 100644
index da79db0..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,59 +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.annotations.core.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- * Base class for initializers contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension point.
- * <p>
- * Provides default implementations for all methods.
- * </p>
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under development and
- * expected to change significantly before reaching stability. It is being made available at this early stage
- * to solicit feedback from pioneering adopters on the understanding that any code that uses this API will
- * almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- *
-*/
-public class AnnotationAttributeInitializer implements IAnnotationAttributeInitializer {
-
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- return Collections.emptyList();
- }
-
- public List<MemberValuePair> getMemberValuePairs(ASTNode astNode, AST ast,
- Class<? extends Annotation> annotationClass) {
- return Collections.emptyList();
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
- return Collections.emptyList();
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(ASTNode astNode,
- MemberValuePair memberValuePair) {
- return Collections.emptyList();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java
deleted file mode 100644
index e536d24..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,97 +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.annotations.core.initialization;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-
-/**
- * Constructs <code>MemberValuePair</code> from the defaults found in the passed in <code>Annotation</code>.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- */
-public class DefaultsAnnotationAttributeInitializer extends AnnotationAttributeInitializer {
-
- public DefaultsAnnotationAttributeInitializer() {
-
- }
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- return getMemberValuePairs(ast, annotationClass);
- }
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(ASTNode astNode, AST ast,
- Class<? extends Annotation> annotationClass) {
- return getMemberValuePairs(ast, annotationClass);
- }
-
- private List<MemberValuePair> getMemberValuePairs(AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- Method[] declaredMethods = annotationClass.getDeclaredMethods();
- for (Method method : declaredMethods) {
- String name = method.getName();
- Class<?> returnType = method.getReturnType();
- Object defaultValue = method.getDefaultValue();
-
- if (defaultValue != null) {
- if (returnType.equals(String.class)) {
- memberValuePairs.add(AnnotationsCore.createStringMemberValuePair(ast,
- name, defaultValue.toString()));
- }
-
- if (returnType.equals(Boolean.TYPE)) {
- memberValuePairs.add(AnnotationsCore.createBooleanMemberValuePair(ast,
- name, Boolean.parseBoolean(defaultValue.toString())));
- }
-
- 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))) {
- memberValuePairs.add(AnnotationsCore.createNumberMemberValuePair(ast, name, defaultValue));
- }
-
- if (returnType.isArray()) {
- memberValuePairs.add(AnnotationsCore.createArrayMemberValuePair(ast, method,
- (Object[])defaultValue));
- }
-
- if (returnType.isEnum()) {
- memberValuePairs.add(AnnotationsCore.createEnumMemberValuePair(ast,
- method.getDeclaringClass().getCanonicalName(), name, defaultValue));
- }
-
- if (returnType.equals(Class.class)) {
- memberValuePairs.add(AnnotationsCore.createTypeMemberVaulePair(ast, name,
- defaultValue));
- }
- }
- }
- return memberValuePairs;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java
deleted file mode 100644
index b64f785..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,44 +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.annotations.core.initialization;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- */
-public interface IAnnotationAttributeInitializer {
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends java.lang.annotation.Annotation> annotationClass);
-
- public List<MemberValuePair> getMemberValuePairs(ASTNode astNode, AST ast,
- Class<? extends java.lang.annotation.Annotation> annotationClass);
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair);
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(ASTNode astNode,
- MemberValuePair memberValuePair);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java
deleted file mode 100644
index 07dff74..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.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.annotations.core.processor;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-
-/**
- * Abstract base class for processors contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationProcessor</code> extension point.
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- *
- */
-public abstract class AbstractAnnotationProcessor implements AnnotationProcessor {
- protected AnnotationProcessorEnvironment environment;
-
- public void setAnnotationProcessorEnvironment(AnnotationProcessorEnvironment environment) {
- this.environment = environment;
- }
-
- public abstract void process();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
deleted file mode 100644
index 1e5b145..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
+++ /dev/null
@@ -1,1149 +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.annotations.core.utils;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.filebuffers.LocationKind;
-import org.eclipse.core.resources.IFile;
-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.jdt.core.IAnnotation;
-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.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-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.ASTVisitor;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
-import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.ChildListPropertyDescriptor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-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.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.PackageDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-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.ui.CodeStyleConfiguration;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.text.edits.TextEditGroup;
-
-/**
- * Utility class for adding, removing and updating annotations and member value pairs.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- */
-public final class AnnotationUtils {
- private static final String FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR
- = "org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator"; //$NON-NLS-1$
- private static final String FORMATTER_INSERT_SPACE_AFTER_ASSIGNMENT_OPERATOR
- = "org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator"; //$NON-NLS-1$
- private static final String DO_NOT_INSERT
- = "do not insert"; //$NON-NLS-1$
-
- private AnnotationUtils() {
- }
-
- @SuppressWarnings("unchecked")
- public static void getImportChange(CompilationUnit compilationUnit,
- Class<? extends java.lang.annotation.Annotation> annotation, TextFileChange textFileChange,
- boolean annotate) {
- try {
- String qualifiedName = annotation.getCanonicalName();
- ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
-
- if (annotate) {
- importRewrite.addImport(qualifiedName);
- } else {
- final String annotationSimpleName = annotation.getSimpleName();
- final List<String> occurences = new ArrayList<String>();
- Target target = annotation.getAnnotation(Target.class);
- List<ElementType> elementTypes = Arrays.asList(target.value());
- for (ElementType elementType : elementTypes) {
- //TODO Handle package annotation imports
- if (elementType == ElementType.TYPE) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(TypeDeclaration typeDeclaration) {
- countAnnotationOccurences(typeDeclaration.modifiers(), annotationSimpleName,
- occurences);
- return super.visit(typeDeclaration);
- }
- });
- }
- if (elementType == ElementType.FIELD) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(FieldDeclaration fieldDeclaration) {
- countAnnotationOccurences(fieldDeclaration.modifiers(), annotationSimpleName,
- occurences);
- return super.visit(fieldDeclaration);
- }
- });
- }
- if (elementType == ElementType.METHOD) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(MethodDeclaration methodDeclaration) {
- countAnnotationOccurences(methodDeclaration.modifiers(), annotationSimpleName,
- occurences);
- return super.visit(methodDeclaration);
- }
- });
- }
- if (elementType == ElementType.PARAMETER) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(SingleVariableDeclaration singleVariableDeclaration) {
- countAnnotationOccurences(singleVariableDeclaration.modifiers(),
- annotationSimpleName, occurences);
- return super.visit(singleVariableDeclaration);
- }
- });
- }
- }
- if (occurences.size() == 1) {
- importRewrite.removeImport(qualifiedName);
- }
- }
- if (importRewrite.hasRecordedChanges()) {
- //TODO Cleanup imports
- // Repeatedly adding and removing an import where none existed before will
- // insert a new line on each insert.
- TextEdit importTextEdit = importRewrite.rewriteImports(null);
- textFileChange.addEdit(importTextEdit);
- }
- } catch (CoreException ce) {
- AnnotationsCorePlugin.log(ce.getStatus());
- }
- }
-
- private static void countAnnotationOccurences(List<IExtendedModifier> modifiers, String annotationSimpleName,
- List<String> occurences) {
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof Annotation) {
- Annotation existingAnnotation = (Annotation) extendedModifier;
- if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationSimpleName)) {
- occurences.add(annotationSimpleName);
- }
- }
- }
- }
-
- public static void createPackageDeclarationAnnotationChange(ICompilationUnit source,
- PackageDeclaration packageDeclaration, ASTRewrite rewriter, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- IProgressMonitor monitor = new NullProgressMonitor();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- try {
- if (packageDeclaration != null && !isAnnotationPresent(packageDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, monitor);
- connected = true;
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(packageDeclaration,
- PackageDeclaration.ANNOTATIONS_PROPERTY);
-
- listRewrite.insertFirst(annotation, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, monitor);
- }
- }
- }
-
- public static void removeAnnotationFromPackageDeclaration(ICompilationUnit source,
- PackageDeclaration packageDeclaration, ASTRewrite rewriter, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- if (packageDeclaration != null && isAnnotationPresent(packageDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(packageDeclaration,
- PackageDeclaration.ANNOTATIONS_PROPERTY);
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation && compareAnnotations((Annotation) object, annotation)) {
- listRewrite.remove((Annotation) object, null);
- }
- }
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void createTypeAnnotationChange(ICompilationUnit source, CompilationUnit
- compilationUnit, ASTRewrite rewriter, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- IType type = compilationUnit.getTypeRoot().findPrimaryType();
- @SuppressWarnings("unchecked")
- List<TypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypes(abstractTypeDeclaration, type)
- && !isAnnotationPresent(abstractTypeDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
- .getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(abstractTypeDeclaration,
- getChildListPropertyDescriptorForType(abstractTypeDeclaration));
-
- listRewrite.insertFirst(annotation, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void removeAnnotationFromType(ICompilationUnit source, CompilationUnit
- compilationUnit, ASTRewrite rewriter, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- IType type = compilationUnit.getTypeRoot().findPrimaryType();
- @SuppressWarnings("unchecked")
- List<TypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypes(abstractTypeDeclaration, type)
- && isAnnotationPresent(abstractTypeDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
- .getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(abstractTypeDeclaration,
- getChildListPropertyDescriptorForType(abstractTypeDeclaration));
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation && compareAnnotations((Annotation)object,
- annotation)) {
- listRewrite.remove((Annotation)object, null);
- }
- }
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] {annotationTextEdit}));
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void createMethodAnnotationChange(ICompilationUnit source, CompilationUnit
- compilationUnit, ASTRewrite rewriter, IMethod method, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- IType type = method.getDeclaringType();
- @SuppressWarnings("unchecked")
- List<AbstractTypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypes(abstractTypeDeclaration, type)) {
- List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(
- abstractTypeDeclaration);
- BodyDeclaration bodyDeclaration = getMethodDeclaration(bodyDeclarations, method);
- if (!isAnnotationPresent(bodyDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
- .getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(bodyDeclaration,
- getChildListPropertyDescriptorForMethod(bodyDeclaration));
- listRewrite.insertAt(annotation, 0, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void removeAnnotationFromMethod(ICompilationUnit source, CompilationUnit
- compilationUnit, ASTRewrite rewriter, IMethod method, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- IType type = method.getDeclaringType();
- @SuppressWarnings("unchecked")
- List<AbstractTypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypes(abstractTypeDeclaration, type)) {
- List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(
- abstractTypeDeclaration);
- BodyDeclaration bodyDeclaration = getMethodDeclaration(bodyDeclarations, method);
- if (isAnnotationPresent(bodyDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
- .getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(bodyDeclaration,
- getChildListPropertyDescriptorForMethod(bodyDeclaration));
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation
- && compareAnnotations((Annotation) object, annotation)) {
- listRewrite.remove((Annotation) object, null);
- }
- }
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void createFiedlAnnotationChange(ICompilationUnit source, CompilationUnit
- compilationUnit, ASTRewrite rewriter, IField field, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- IType type = field.getDeclaringType();
- @SuppressWarnings("unchecked")
- List<AbstractTypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypes(abstractTypeDeclaration, type)) {
- List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(
- abstractTypeDeclaration);
- FieldDeclaration fieldDeclaration = (FieldDeclaration) getFieldDeclaration(
- bodyDeclarations, field);
- if (!isAnnotationPresent(fieldDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
- .getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(fieldDeclaration,
- FieldDeclaration.MODIFIERS2_PROPERTY);
- listRewrite.insertAt(annotation, 0, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void removeAnnotationFromField(ICompilationUnit source, CompilationUnit
- compilationUnit, ASTRewrite rewriter, IField field, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- IType type = field.getDeclaringType();
- @SuppressWarnings("unchecked")
- List<AbstractTypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypes(abstractTypeDeclaration, type)) {
- List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(
- abstractTypeDeclaration);
- FieldDeclaration fieldDeclaration = (FieldDeclaration) getFieldDeclaration(
- bodyDeclarations, field);
-
- if (isAnnotationPresent(fieldDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
- .getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(fieldDeclaration,
- FieldDeclaration.MODIFIERS2_PROPERTY);
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation
- && compareAnnotations((Annotation) object, annotation)) {
- listRewrite.remove((Annotation) object, null);
- }
- }
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void createMethodParameterAnnotationChange(ICompilationUnit source, CompilationUnit
- compilationUnit, ASTRewrite rewriter, SingleVariableDeclaration singleVariableDeclaration,
- IMethod method, Annotation annotation, TextFileChange textFileChange) throws CoreException {
-
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- IType type = method.getDeclaringType();
- @SuppressWarnings("unchecked")
- List<AbstractTypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypes(abstractTypeDeclaration, type)) {
- List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(abstractTypeDeclaration);
- MethodDeclaration methodDeclaration = (MethodDeclaration) getMethodDeclaration(
- bodyDeclarations, method);
-
- @SuppressWarnings("unchecked")
- List<SingleVariableDeclaration> parameters = methodDeclaration.parameters();
- for (SingleVariableDeclaration parameter : parameters) {
- if (compareMethodParameters(parameter, singleVariableDeclaration)
- && !isAnnotationPresent(parameter, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
- .getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(parameter,
- SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
- listRewrite.insertAt(annotation, -1, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- }
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void createMethodParameterAnnotationChange(ICompilationUnit source, ASTRewrite rewriter,
- SingleVariableDeclaration singleVariableDeclaration, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- if (!isAnnotationPresent(singleVariableDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(singleVariableDeclaration,
- SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
- listRewrite.insertAt(annotation, -1, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void removeAnnotationFromMethodParameter(ICompilationUnit source, ASTRewrite rewriter,
- SingleVariableDeclaration singleVariableDeclaration, Annotation annotation,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- if (isAnnotationPresent(singleVariableDeclaration, annotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(singleVariableDeclaration,
- SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation && compareAnnotations((Annotation)object, annotation)) {
- listRewrite.remove((Annotation)object, null);
- }
- }
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void createMemberVaulePairChange(ICompilationUnit source, CompilationUnit compilationUnit,
- ASTRewrite rewriter, IJavaElement javaElement, IAnnotation annotation, ASTNode memberValuePair,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- List<IExtendedModifier> modifiers = getExtendedModifiers(compilationUnit, javaElement);
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof NormalAnnotation) {
- NormalAnnotation existingAnnotation = (NormalAnnotation) extendedModifier;
- if (AnnotationUtils.compareAnnotations(annotation, existingAnnotation)) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
- .getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(existingAnnotation,
- NormalAnnotation.VALUES_PROPERTY);
-
- listRewrite.insertLast(memberValuePair, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void createMemberVaulePairChange(ICompilationUnit source, CompilationUnit compilationUnit,
- ASTRewrite rewriter, NormalAnnotation annotation, ASTNode memberValuePair,
- TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
- ListRewrite listRewrite = rewriter.getListRewrite(annotation,
- NormalAnnotation.VALUES_PROPERTY);
-
- listRewrite.insertLast(memberValuePair, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void updateMemberVaulePairValue(ICompilationUnit source, CompilationUnit compilationUnit,
- ASTRewrite rewriter, IJavaElement javaElement, IAnnotation annotation, IMemberValuePair memberValuePair,
- ASTNode value, TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- List<IExtendedModifier> modifiers = getExtendedModifiers(compilationUnit, javaElement);
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof NormalAnnotation) {
- NormalAnnotation existingAnnotation = (NormalAnnotation) extendedModifier;
- if (AnnotationUtils.compareAnnotations(annotation, existingAnnotation)) {
- @SuppressWarnings("unchecked")
- List<MemberValuePair> memberVaulePairs = existingAnnotation.values();
- for (MemberValuePair memberValuePairDOM : memberVaulePairs) {
- if (memberValuePairDOM.getName().toString().equals(
- memberValuePair.getMemberName())) {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager
- .getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
- rewriter.set(memberValuePairDOM, MemberValuePair.VALUE_PROPERTY, value, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document,
- getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- }
- }
- }
- }
- }
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- public static void updateMemberVaulePairValue(ICompilationUnit source, CompilationUnit compilationUnit,
- ASTRewrite rewriter, NormalAnnotation annotation, MemberValuePair memberValuePair,
- ASTNode value, TextFileChange textFileChange) throws CoreException {
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = source.getResource().getFullPath();
- boolean connected = false;
- try {
- bufferManager.connect(path, LocationKind.IFILE, null);
- connected = true;
-
- IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
- rewriter.set(memberValuePair, MemberValuePair.VALUE_PROPERTY, value, null);
-
- TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
- textFileChange.addEdit(annotationTextEdit);
-
- textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
- TextEdit[] { annotationTextEdit }));
- } finally {
- if (connected) {
- bufferManager.disconnect(path, LocationKind.IFILE, null);
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- private static Map getOptions(ICompilationUnit source) {
- Map options = source.getJavaProject().getOptions(true);
- options.put(FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, DO_NOT_INSERT);
- options.put(FORMATTER_INSERT_SPACE_AFTER_ASSIGNMENT_OPERATOR, DO_NOT_INSERT);
- return options;
- }
-
- private static ChildListPropertyDescriptor getChildListPropertyDescriptorForType(AbstractTypeDeclaration
- abstractTypeDeclaration) {
- ChildListPropertyDescriptor childListPropertyDescriptor = null;
- if (abstractTypeDeclaration instanceof TypeDeclaration) {
- childListPropertyDescriptor = TypeDeclaration.MODIFIERS2_PROPERTY;
- }
- if (abstractTypeDeclaration instanceof EnumDeclaration) {
- childListPropertyDescriptor = EnumDeclaration.MODIFIERS2_PROPERTY;
- }
- if (abstractTypeDeclaration instanceof AnnotationTypeDeclaration) {
- childListPropertyDescriptor = AnnotationTypeDeclaration.MODIFIERS2_PROPERTY;
- }
- return childListPropertyDescriptor;
- }
-
- private static ChildListPropertyDescriptor getChildListPropertyDescriptorForMethod(
- BodyDeclaration bodyDeclaration) {
- if (bodyDeclaration instanceof MethodDeclaration) {
- return MethodDeclaration.MODIFIERS2_PROPERTY;
- }
- if (bodyDeclaration instanceof AnnotationTypeMemberDeclaration) {
- return AnnotationTypeMemberDeclaration.MODIFIERS2_PROPERTY;
- }
- return null;
- }
-
- public static CompilationUnit getASTParser(ICompilationUnit source) {
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(source);
- CompilationUnit compilationUnit = (CompilationUnit) parser.createAST(new NullProgressMonitor());
- compilationUnit.recordModifications();
- return compilationUnit;
- }
-
- public static TextFileChange createTextFileChange(String textFileChangeName, IFile file) {
- TextFileChange textFileChange = new TextFileChange(textFileChangeName, file);
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
- return textFileChange;
- }
-
- @SuppressWarnings("unchecked")
- public static List<SingleVariableDeclaration> getMethodParameters(IType type, final IMethod method) {
- ICompilationUnit source = type.getCompilationUnit();
- CompilationUnit compilationUnit = getASTParser(source);
- final List<SingleVariableDeclaration> parameters = new ArrayList();
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(MethodDeclaration methodDeclaration) {
- if (compareMethods(methodDeclaration, method)) {
- parameters.addAll(methodDeclaration.parameters());
- }
- return super.visit(methodDeclaration);
- }
- });
- return parameters;
- }
-
- public static String getAnnotationName(Annotation annotation) {
- Name annotationTypeName = annotation.getTypeName();
- return annotationTypeName.getFullyQualifiedName();
- }
-
- public static boolean compareTypes(AbstractTypeDeclaration abstractTypeDeclaration, IType type) {
- return abstractTypeDeclaration.getName().getIdentifier().equals(type.getElementName());
- }
-
- @SuppressWarnings("unchecked")
- public static boolean compareMethods(MethodDeclaration methodDeclaration, IMethod method) {
- if (methodDeclaration.getName().getIdentifier().equals(method.getElementName())) {
- String[] parametetNames = method.getParameterTypes();
- List<SingleVariableDeclaration> methodDeclarationParameters = methodDeclaration.parameters();
- if (parametetNames.length == methodDeclarationParameters.size()) {
- for (int i = 0; i < parametetNames.length; i++) {
- String simpleName1 = Signature.getSimpleName(Signature.toString(Signature
- .getTypeErasure(parametetNames[i])));
- String simpleName2 = methodDeclarationParameters.get(i).getType().toString();
- if (!simpleName1.equals(simpleName2)) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- public static boolean compareMethods(AnnotationTypeMemberDeclaration memmberDeclaration, IMethod method) {
- if (memmberDeclaration.getName().getIdentifier().equals(method.getElementName())) {
- return true;
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public static boolean compareFields(FieldDeclaration fieldDeclaration, IField field) {
- List<VariableDeclarationFragment> fragments = fieldDeclaration.fragments();
- for (VariableDeclarationFragment variableDeclarationFragment : fragments) {
- if (variableDeclarationFragment.getName().getIdentifier().equals(field.getElementName())) {
- return true;
- }
- }
- return false;
- }
-
- public static String accountForOverloadedMethods(IType type, IMethod method) throws JavaModelException {
- List<IMethod> methods = Arrays.asList(type.getMethods());
- List<IMethod> similarMethods = new ArrayList<IMethod>();
- for (IMethod methodToTest : methods) {
- if (!method.equals(methodToTest) && method.getElementName().equalsIgnoreCase(
- methodToTest.getElementName()) && methodToTest.getSourceRange().getOffset() <
- method.getSourceRange().getOffset()) {
- similarMethods.add(methodToTest);
- }
- }
- return similarMethods.size() > 0 ? Integer.toString(similarMethods.size()) : ""; //$NON-NLS-1$
- }
-
- private static boolean compareAnnotations(Annotation newAnnotation, Annotation existingAnnotation) {
- return AnnotationUtils.getAnnotationName(existingAnnotation).equals(
- AnnotationUtils.getAnnotationName(newAnnotation));
- }
-
- private static boolean compareAnnotations(IAnnotation newAnnotation, Annotation existingAnnotation) {
- return AnnotationUtils.getAnnotationName(existingAnnotation).equals(newAnnotation.getElementName());
- }
-
- @SuppressWarnings("unchecked")
- public static boolean isAnnotationPresent(SingleVariableDeclaration parameter, String annotationName) {
- List<IExtendedModifier> modifiers = parameter.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof Annotation) {
- Annotation existingAnnotation = (Annotation) extendedModifier;
- if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationName)) {
- return true;
- }
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public static boolean isAnnotationPresent(SingleVariableDeclaration parameter,
- Annotation annatotationToAdd) {
- boolean exists = false;
- List<IExtendedModifier> modifiers = parameter.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof Annotation) {
- Annotation existingAnnotation = (Annotation) extendedModifier;
- if (compareAnnotations(annatotationToAdd, existingAnnotation)) {
- return true;
- }
- }
- }
- return exists;
- }
-
- public static boolean isAnnotationPresent(IJavaElement javaElement, String annotationName) {
- if (javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
- return isAnnotationPresent(((ICompilationUnit)javaElement).findPrimaryType(), annotationName);
- }
-
- ICompilationUnit source = ((IMember)javaElement).getCompilationUnit();
-
- int elementType = javaElement.getElementType();
- CompilationUnit compilationUnit = getASTParser(source);
- if (elementType == IJavaElement.PACKAGE_DECLARATION) {
- return isAnnotationPresent(compilationUnit.getPackage(), annotationName);
- }
- if (elementType == IJavaElement.TYPE || elementType == IJavaElement.METHOD ||
- elementType == IJavaElement.FIELD) {
- return isAnnotationPresent(compilationUnit, javaElement, annotationName);
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public static boolean isAnnotationPresent(PackageDeclaration packageDeclaration, String annotationName) {
- List<Annotation> annotations = packageDeclaration.annotations();
- for (Annotation existingAnnotation : annotations) {
- if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationName)) {
- return true;
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public static boolean isAnnotationPresent(PackageDeclaration packageDeclaration, Annotation annotation) {
- List<Annotation> annotations = packageDeclaration.annotations();
- for (Annotation existingAnnotation : annotations) {
- if (compareAnnotations(annotation, existingAnnotation)) {
- return true;
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private static boolean isAnnotationPresent(BodyDeclaration bodyDeclaration, Annotation annatotationToAdd) {
- boolean exists = false;
- List<IExtendedModifier> modifiers = bodyDeclaration.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof Annotation) {
- Annotation existingAnnotation = (Annotation) extendedModifier;
- if (compareAnnotations(annatotationToAdd, existingAnnotation)) {
- return true;
- }
- }
- }
- return exists;
- }
-
- private static boolean isAnnotationPresent(CompilationUnit compilationUnit, IJavaElement javaElement,
- String annotationName) {
-
- List<IExtendedModifier> modifiers = getExtendedModifiers(compilationUnit, javaElement);
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof Annotation) {
- Annotation existingAnnotation = (Annotation) extendedModifier;
- if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationName)) {
- return true;
- }
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public static List<IExtendedModifier> getExtendedModifiers(CompilationUnit compilationUnit,
- IJavaElement javaElement) {
- IType type = compilationUnit.getTypeRoot().findPrimaryType();
- List<AbstractTypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypes(abstractTypeDeclaration, type)) {
- List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(abstractTypeDeclaration);
-
- BodyDeclaration bodyDeclaration = null;
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- bodyDeclaration = abstractTypeDeclaration;
- }
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- bodyDeclaration = getMethodDeclaration(bodyDeclarations, (IMethod) javaElement);
- }
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- bodyDeclaration = getFieldDeclaration(bodyDeclarations, (IField) javaElement);
- }
-
- return bodyDeclaration != null ? bodyDeclaration.modifiers() : Collections.emptyList();
- }
- }
- return Collections.emptyList();
- }
-
- @SuppressWarnings("unchecked")
- public static List<BodyDeclaration> getBodyDeclarationsForType(
- AbstractTypeDeclaration abstractTypeDeclaration) {
- if (abstractTypeDeclaration instanceof TypeDeclaration) {
- TypeDeclaration typeDeclaration = (TypeDeclaration) abstractTypeDeclaration;
- return typeDeclaration.bodyDeclarations();
- }
- if (abstractTypeDeclaration instanceof EnumDeclaration) {
- EnumDeclaration enumDeclaration = (EnumDeclaration) abstractTypeDeclaration;
- return enumDeclaration.bodyDeclarations();
- }
- if (abstractTypeDeclaration instanceof AnnotationTypeDeclaration) {
- AnnotationTypeDeclaration annotationTypeDeclaration =
- (AnnotationTypeDeclaration) abstractTypeDeclaration;
- return annotationTypeDeclaration.bodyDeclarations();
- }
- return Collections.emptyList();
- }
-
- private static BodyDeclaration getMethodDeclaration(List<BodyDeclaration> bodyDeclarations,
- IMethod method) {
- for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
- if (bodyDeclaration instanceof MethodDeclaration) {
- if (compareMethods((MethodDeclaration)bodyDeclaration, method)) {
- return bodyDeclaration;
- }
- }
- if (bodyDeclaration instanceof AnnotationTypeMemberDeclaration) {
- if (compareMethods((AnnotationTypeMemberDeclaration)bodyDeclaration, method)) {
- return bodyDeclaration;
- }
- }
- }
- return null;
- }
-
- private static BodyDeclaration getFieldDeclaration(List<BodyDeclaration> bodyDeclarations, IField field) {
- for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
- if (bodyDeclaration instanceof FieldDeclaration) {
- if (compareFields((FieldDeclaration)bodyDeclaration, field)) {
- return bodyDeclaration;
- }
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- public static SingleVariableDeclaration getMethodParameter(CompilationUnit compilationUnit,
- IMethod method, int offset) {
- if (compilationUnit == null) {
- compilationUnit = getASTParser(method.getCompilationUnit());
- }
- IType type = method.getDeclaringType();
- List<AbstractTypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (abstractTypeDeclaration.getName().getIdentifier().equals(type.getElementName())) {
- String methodToAnnotateName = method.getElementName();
- List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(abstractTypeDeclaration);
- for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
- if (bodyDeclaration instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) bodyDeclaration;
- if (methodDeclaration.getName().getIdentifier().equals(methodToAnnotateName)) {
- List<SingleVariableDeclaration> parameters = methodDeclaration.parameters();
- for (SingleVariableDeclaration parameter : parameters) {
- int parameterStartPosition = parameter.getStartPosition();
- int parameterLength = parameter.getLength();
- if (offset >= parameterStartPosition
- && offset <= parameterStartPosition + parameterLength) {
- return parameter;
- }
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- private static boolean compareMethodParameters(SingleVariableDeclaration paramOne,
- SingleVariableDeclaration paramTwo) {
- String typeOne = paramOne.getType().toString();
- String nameOne = paramOne.getName().getIdentifier();
-
- String typeTwo = paramTwo.getType().toString();
- String nameTwo = paramTwo.getName().getIdentifier();
-
- return (typeOne.equals(typeTwo)) && (nameOne.equals(nameTwo));
- }
-
- public static CompletionProposal createCompletionProposal(String proposal, Expression value) {
- int replacementOffset = value.getStartPosition() + 1;
- int replacementLength = value.getLength() - 2;
-
- return new CompletionProposal(proposal, replacementOffset, replacementLength,
- proposal.length());
- }
-
- public static CompletionProposal createCompletionProposal(String proposal, Expression value,
- Image image) {
- int replacementOffset = value.getStartPosition() + 1;
- int replacementLength = value.getLength() - 2;
-
- return new CompletionProposal(proposal, replacementOffset, replacementLength, proposal.length(),
- image, proposal, null, null);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessor.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessor.java
deleted file mode 100644
index 0364fcf..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessor.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.annotations.core.processor;
-
-import java.util.List;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-/**
- *
- * @author sclarke
- *
- */
-public class AnnotationsCoreProcessor implements AnnotationProcessor {
-
- private List<AnnotationProcessor> annotationProcessors;
-
- public AnnotationsCoreProcessor(List<AnnotationProcessor> annotationProcessors) {
- this.annotationProcessors = annotationProcessors;
- }
-
- public void process() {
- for (AnnotationProcessor annotationProcessor : annotationProcessors) {
- annotationProcessor.process();
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java
deleted file mode 100644
index a259c8e..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java
+++ /dev/null
@@ -1,87 +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.annotations.core.processor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jdt.apt.core.util.AptPreferenceConstants;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class AnnotationsCoreProcessorFactory implements AnnotationProcessorFactory {
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> annotationSet,
- AnnotationProcessorEnvironment processorEnvironment) {
-
- List<AnnotationProcessor> annotationProcessors = new ArrayList<AnnotationProcessor>();
-
- Map<String, List<IConfigurationElement>> annotationProcessorCache =
- AnnotationsManager.getAnnotationProcessorsCache();
-
- for (AnnotationTypeDeclaration annotationTypeDeclaration : annotationSet) {
- List<IConfigurationElement> processorElements = annotationProcessorCache.get(
- annotationTypeDeclaration.getQualifiedName());
-
- for (IConfigurationElement configurationElement : processorElements) {
- if (configurationElement != null) {
- AnnotationProcessor processor = getAnnotationProcessor(configurationElement,
- processorEnvironment);
- if (processor != null) {
- annotationProcessors.add(processor);
- }
- }
- }
- }
-
- return new AnnotationsCoreProcessor(annotationProcessors);
- }
-
- public AnnotationProcessor getAnnotationProcessor(IConfigurationElement configurationElement,
- AnnotationProcessorEnvironment processorEnvironment) {
- try {
- AbstractAnnotationProcessor annotationProcessor =
- (AbstractAnnotationProcessor)configurationElement.createExecutableExtension("class");
- annotationProcessor.setAnnotationProcessorEnvironment(processorEnvironment);
- return annotationProcessor;
- } catch (CoreException ce) {
- AnnotationsCorePlugin.log(ce.getStatus());
- }
- return null;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return AnnotationsManager.getAnnotationProcessorsCache().keySet();
- }
-
- public Collection<String> supportedOptions() {
- List<String> options = new ArrayList<String>();
- options.add(AptPreferenceConstants.PROCESSING_IN_EDITOR_DISABLED_OPTION);
- return options;
- }
-
-}
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 00c1fd6..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.3.4.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
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.ws,
- org.eclipse.core.resources,
- org.eclipse.jst.ws,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.jdt.core,
- javax.wsdl,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jst.ws.jaxws.core
-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/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/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.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
deleted file mode 100644
index 82e4ea3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
+++ /dev/null
@@ -1,16 +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.org
-
-WEB_SERVICE_LOCATOR_AXIS=Apache CXF Web Service Locator
-WEB_SERVICE_LOCATOR_CATEGORY_AXIS=Apache CXF Components
\ No newline at end of file
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 5a3a4b3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
+++ /dev/null
@@ -1,17 +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>
-
-</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 146315b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
+++ /dev/null
@@ -1,31 +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;
-
-/**
- *
- * @author sclarke
- *
- */
-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 4c77c2c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
+++ /dev/null
@@ -1,80 +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.
- *
- * @author sclarke
- */
-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.getLocalizedMessage(), 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 59769f1..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,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.core.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.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.
- *
- * @author sclarke
- */
-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(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;
- }
-}
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 eccf08e..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,124 +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.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-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.internal.cxf.core.utils.WSDLUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-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.
- *
- * @author sclarke
- */
-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.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
- model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
- 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()));
-
- 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);
-
- if (wsdlUrl.getProtocol().equals("file")) { //$NON-NLS-1$
- SOAPAddress soapAddress = WSDLUtils.getEndpointAddress(definition);
- if (soapAddress != null) {
- String address = soapAddress.getLocationURI();
- URL endpointURL = new URL(address);
- if (endpointURL.getQuery() == null) {
- address += "?wsdl"; //$NON-NLS-1$
- }
- model.setWsdlLocation(address);
- }
- }
-
- model.setWsdlDefinition(definition);
- }
-
- } catch (MalformedURLException murle) {
- status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- murle.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 f45af6f..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,64 +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;
-
-/**
- * @author sclarke
- */
-@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.jaxws.core/.classpath b/bundles/org.eclipse.jst.ws.jaxws.core/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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.jaxws.core/.project b/bundles/org.eclipse.jst.ws.jaxws.core/.project
deleted file mode 100644
index 379770e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.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.jaxws.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83e002a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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.jaxws.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 2696153..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.core;singleton:=true
-Bundle-Vendor: %pluginProvider
-Bundle-Version: 0.5.1.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.jaxws.core.JAXWSCorePlugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.jdt.apt.core,
- org.eclipse.core.filesystem,
- org.eclipse.core.filebuffers,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ui,
- org.eclipse.jst.ws.annotations.core
-Export-Package: org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization;x-friends:="org.eclipse.jst.ws.annotations.core",
- org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;x-friends:="org.eclipse.jst.ws.annotations.core",
- org.eclipse.jst.ws.jaxws.core.utils
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/about.html b/bundles/org.eclipse.jst.ws.jaxws.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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.jaxws.core/build.properties b/bundles/org.eclipse.jst.ws.jaxws.core/build.properties
deleted file mode 100644
index bc3b0f2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties
deleted file mode 100644
index ea694b2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties
+++ /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
-###############################################################################
-
-#properties file for JAXWS Core
-pluginName=JAX-WS Tools Core (Incubation)
-pluginProvider=Eclipse.org
-
-WEBSERVICE_CLASS_PUBLIC_ABSTRACT_FINAL_RULE=Classes annotated with @WebService must be an outer public class, must not be final, and must not be abstract
-WEBSERVICE_CLASS_NO_FINALIZE_METHOD_RULE=Classes annotated with @WebService must not define a finalize() method
-WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE_ANNNOTATION=@WebMethod annotations only supported in classes with the @WebService annotation
-WEBSERVICE_SEI_NO_WEBMETHOS_RULE=No @WebMethod annotations allowed in an implementation class that contains an endpointInterface attribute in it's @WebService annotation
-WEBSERVICE_ON_SEI_ATTRIBUTES_RULE=Certain @WebService annotation attributes are restricted when used on SEI's
-WEBSERVICE_WEBSERVICE_PROVIDER_COEXIST_RULE=@WebService and @WebServiceProvider annotations cannot coexist
-ONEWAY_NO_RETURN_VALUE=@Oneway methods must not return a value
-WEBMETHOD_ONLY_PUBLIC_METHODS=@WebMethod only allowed on public methods
-SOAPBINDING_METHOD_STYLE_DOCUMENT_RULE=@SOAPBinding annotation may be placed on a method if and only if the SOAPBinding.style is DOCUMENT.
-WEBMETHOD_EXCLUDE_SPECIFIED_RULE=@WebMethod exclude attribute is not allowed in SEI's. If specified in an implementation class, then other attributes in the @WebMethod annotation are not allowed
-SOAPBINDING_NO_PARAMETERSTYLE_WHEN_ENCODED_RULE=A method that has a SOAPBinding.use of ENCODED cannot have a SOAPBinding.parameterStyle present.
-JAXWS_CATEGORY_NAME=JAX-WS
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
deleted file mode 100644
index 72ccc85..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
+++ /dev/null
@@ -1,255 +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="jaxws.category"
- name="%JAXWS_CATEGORY_NAME">
- </category>
- </extension>
-
- <extension point="org.eclipse.jst.ws.annotations.core.annotationDefinition">
- <annotation
- category="jaxws.category"
- class="javax.jws.WebService"
- name="WebService">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.jws.WebMethod"
- name="WebMethod">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.jws.WebParam"
- name="WebParam">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.jws.WebResult"
- name="WebResult">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.jws.HandlerChain"
- name="HandlerChain">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.jws.Oneway"
- name="Oneway">
- </annotation>
- <!-- <annotation
- category="jaxws.category"
- class="javax.jws.soap.SOAPMessageHandler"
- name="SOAPMessageHandler">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.jws.soap.SOAPMessageHandlers"
- name="SOAPMessageHandlers">
- </annotation> -->
- <annotation
- category="jaxws.category"
- class="javax.jws.soap.SOAPBinding"
- name="SOAPBinding">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.WebServiceProvider"
- name="WebServiceProvider"
- restrictedTo="CLASS_ONLY">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.WebServiceClient"
- name="WebServiceClient"
- restrictedTo="CLASS_ONLY">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.WebServiceRef"
- name="WebServiceRef">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.WebServiceRefs"
- name="WebServiceRefs">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.ServiceMode"
- name="ServiceMode">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.WebFault"
- name="WebFault">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.BindingType"
- name="BindingType"
- restrictedTo="CLASS_ONLY">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.RequestWrapper"
- name="RequestWrapper">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.ResponseWrapper"
- name="ResponseWrapper">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.WebEndpoint"
- name="WebEndpoint"
- restrictedTo="CLASS_ONLY">
- <!-- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.RespectBinding"
- name="RespectBinding"
- restrictedTo="CLASS_ONLY">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.soap.Addressing"
- name="Addressing">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.soap.MTOM"
- name="MTOM">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.FaultAction"
- name="FaultAction">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.Action"
- name="Action">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.spi.WebServiceFeatureAnnotation"
- name="WebServiceFeatureAnnotation"> -->
- </annotation>
- </extension>
-
- <extension point="org.eclipse.jst.ws.annotations.core.annotationInitializer">
- <initializer
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebServiceAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebMethod"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebMethodAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebParam"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebParamAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebResult"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebResultAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.soap.SOAPBinding"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.SOAPBindingAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.xml.ws.RequestWrapper"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.RequestWrapperAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.xml.ws.ResponseWrapper"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.ResponseWrapperAttributeInitializer">
- </initializer>
- </extension>
-
- <extension point="org.eclipse.jst.ws.annotations.core.annotationProcessor">
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServicePublicAbstractFinalRule">
- <description>
- %WEBSERVICE_CLASS_PUBLIC_ABSTRACT_FINAL_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceNoFinalizeMethodRule">
- <description>
- %WEBSERVICE_CLASS_NO_FINALIZE_METHOD_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceSEIPresentNoWebMethodRule">
- <description>
- %WEBSERVICE_SEI_NO_WEBMETHOS_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceSEIAllowedAttributesRule">
- <description>
- %WEBSERVICE_ON_SEI_ATTRIBUTES_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceWebServiceProviderCoExistRule">
- <description>
- %WEBSERVICE_WEBSERVICE_PROVIDER_COEXIST_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebMethod"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebMethodCheckForWebServiceRule">
- <description>
- %WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE_ANNNOTATION
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebMethod"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebMethodPublicMethodsOnlyRule">
- <description>
- %WEBMETHOD_ONLY_PUBLIC_METHODS
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebMethod"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebMethodExcludeRules">
- <description>
- %WEBMETHOD_EXCLUDE_SPECIFIED_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.Oneway"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.OnewayNoReturnValueRule">
- <description>
- %ONEWAY_NO_RETURN_VALUE
- </description>
- </processor>
- <processor
- annotation="javax.jws.soap.SOAPBinding"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.SOAPBindingMethodStyleDocumentRule">
- <description>
- %SOAPBINDING_METHOD_STYLE_DOCUMENT_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.soap.SOAPBinding"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.SOAPBindingMethodUseRule">
- <description>
- %SOAPBINDING_NO_PARAMETERSTYLE_WHEN_ENCODED_RULE
- </description>
- </processor>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java
deleted file mode 100644
index c06f749..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java
+++ /dev/null
@@ -1,54 +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.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- *
- * @author sclarke
- *
- */
-public class JAXWSCoreMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages"; //$NON-NLS-1$
-
- public static String TYPE_NAME_DIFFERENT_CASE_EXISTS;
- public static String TYPE_WITH_NAME_ALREADY_EXISTS;
-
- public static String ONEWAY_ANNOTATION_PROCESSOR_NO_RETURN_VALUE_ERROR_MESSAGE;
-
- public static String WEBMETHOD_ANNOTATION_PROCESSOR_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE_MESSAGE;
- public static String WEBMETHOD_ANNOTATION_PROCESSOR_ONLY_ON_PUBLIC_METHODS_MESSAGE;
- public static String WEBMETHOD_ANNOTATION_PROCESSOR_EXCLUDE_SPECIFEID_NO_OTHER_ATTRIBUTES_ALLOWED_MESSAGE;
- public static String WEBMETHOD_ANNOTATION_PROCESSOR_EXCLUDE_NOT_ALLOWED_ON_SEI;
-
- public static String WEBSERVICE_ANNOTATION_PROCESSOR_PUBLIC_ABSTRACT_FINAL_MESSAGE;
- public static String WEBSERVICE_ANNOTATION_PROCESSOR_OVERRIDE_FINALIZE_MESSAGE;
- public static String WEBSERVICE_ANNOTATION_PROCESSOR_ENDPOINTINTERFACE_SEI_ERROR_MESSAGE;
- public static String WEBSERVICE_ANNOTATION_PROCESSOR_PORTNAME_SEI_ERROR_MESSAGE;
- public static String WEBSERVICE_ANNOTATION_PROCESSOR_SERVICENAME_SEI_ERROR_MESSAGE;
- public static String WEBSERVICE_ANNOTATION_PROCESSOR_WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHOS_ERROR_MESSAGE;
- public static String WEBSERVICE_ANNOTATION_PROCESSOR_WEBSERVICE_WEBSERVICEPROVIDER_ERROR_MESSAGE;
- public static String SOAPBINDING_ANNOTATION_PROCESSOR_ON_METHOD_STYLE_DOCUMENT_ONLY_MESSAGE;
- public static String SOAPBINDING_ANNOTATION_PROCESSOR_NO_PARAMETERSTYLE_WHEN_ENCODED_MESSAGE;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, JAXWSCoreMessages.class);
- }
-
- private JAXWSCoreMessages() {
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties
deleted file mode 100644
index 337d276..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties
+++ /dev/null
@@ -1,29 +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
-###############################################################################
-
-#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}''
-
-WEBSERVICE_ANNOTATION_PROCESSOR_PUBLIC_ABSTRACT_FINAL_MESSAGE=Classes annotated with @WebService must be an outer public class, must not be final, and must not be abstract
-WEBSERVICE_ANNOTATION_PROCESSOR_OVERRIDE_FINALIZE_MESSAGE=Classes annotated with @WebService must not define a finalize() method
-WEBMETHOD_ANNOTATION_PROCESSOR_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE_MESSAGE=@WebMethod only supported on classes annotated with @WebService
-WEBMETHOD_ANNOTATION_PROCESSOR_ONLY_ON_PUBLIC_METHODS_MESSAGE=@WebMethod only allowed on public methods
-WEBMETHOD_ANNOTATION_PROCESSOR_EXCLUDE_SPECIFEID_NO_OTHER_ATTRIBUTES_ALLOWED_MESSAGE=@WebMethod exclude attribute is specified. No other attributes allowed.
-WEBMETHOD_ANNOTATION_PROCESSOR_EXCLUDE_NOT_ALLOWED_ON_SEI=@WebMethod annotations in SEI's are not allowed to specify the exclude attribute.
-WEBSERVICE_ANNOTATION_PROCESSOR_SERVICENAME_SEI_ERROR_MESSAGE=@WebService serviceName element not allowed on SEI
-WEBSERVICE_ANNOTATION_PROCESSOR_ENDPOINTINTERFACE_SEI_ERROR_MESSAGE=@WebService endpointInterface element not allowed on SEI
-WEBSERVICE_ANNOTATION_PROCESSOR_PORTNAME_SEI_ERROR_MESSAGE=@WebService portName element not allowed on SEI
-WEBSERVICE_ANNOTATION_PROCESSOR_WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHOS_ERROR_MESSAGE=@WebService annotation contains an endpointInterface attribute. No methods annotated with @WebMethod allowed on implementation class in this instance
-WEBSERVICE_ANNOTATION_PROCESSOR_WEBSERVICE_WEBSERVICEPROVIDER_ERROR_MESSAGE=@WebService and @WebServiceProvider annotations cannot both be present on the same class
-ONEWAY_ANNOTATION_PROCESSOR_NO_RETURN_VALUE_ERROR_MESSAGE=@Oneway methods must not return a value
-SOAPBINDING_ANNOTATION_PROCESSOR_ON_METHOD_STYLE_DOCUMENT_ONLY_MESSAGE=The @SOAPBinding annotation may be placed on a method if and only if the SOAPBinding.style is DOCUMENT.
-SOAPBINDING_ANNOTATION_PROCESSOR_NO_PARAMETERSTYLE_WHEN_ENCODED_MESSAGE=A method that has a SOAPBinding.use of ENCODED cannot have a SOAPBinding.parameterStyle present.
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCorePlugin.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCorePlugin.java
deleted file mode 100644
index d42e1d2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCorePlugin.java
+++ /dev/null
@@ -1,55 +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.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- *
- * @author sclarke
- *
- */
-public class JAXWSCorePlugin extends Plugin {
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.core"; //$NON-NLS-1$
-
- // The shared instance
- private static JAXWSCorePlugin plugin;
-
- public static JAXWSCorePlugin 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) {
- JAXWSCorePlugin.log(new Status(severity, JAXWSCorePlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- JAXWSCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- JAXWSCorePlugin.log(new Status(IStatus.ERROR, JAXWSCorePlugin.PLUGIN_ID, exception
- .getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/RequestWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/RequestWrapperAttributeInitializer.java
deleted file mode 100644
index 9e47679..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/RequestWrapperAttributeInitializer.java
+++ /dev/null
@@ -1,125 +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.core.annotations.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-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.JAXWSCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- *
- * @author sclarke
- *
- */
-public class RequestWrapperAttributeInitializer extends AnnotationAttributeInitializer {
- private static final String CLASS_NAME = "className";
- private static final String LOCAL_NAME = "localName";
- private static final String TARGET_NAMESPACE = "targetNamespace";
-
- public RequestWrapperAttributeInitializer() {
- }
-
- @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>();
- 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(AnnotationUtils.createCompletionProposal(getClassName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(LOCAL_NAME)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(getLocalName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(getTargetNamespace(type),
- memberValuePair.getValue()));
- }
- }
- return completionProposals;
- }
-
- private String getPackageName(IType type) {
- String packageName = type.getPackageFragment().getElementName();
- if (packageName == null || packageName.length() == 0) {
- packageName = "default_package"; //$NON-NLS-1$
- }
- return packageName += "."; //$NON-NLS-1$
- }
-
- private String getClassName(IType type, IMethod method) {
- try {
- String methodName = method.getElementName();
- return getPackageName(type) + methodName.substring(0, 1).toUpperCase(Locale.getDefault())
- + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(type, method);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return "";
- }
-
- private String getLocalName(IType type, IMethod method) {
- try {
- return method.getElementName() + AnnotationUtils.accountForOverloadedMethods(type, method);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return "";
- }
-
- private String getTargetNamespace(IType type) {
- return JDTUtils.getTargetNamespaceFromPackageName(getPackageName(type));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/ResponseWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/ResponseWrapperAttributeInitializer.java
deleted file mode 100644
index fe1e613..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/ResponseWrapperAttributeInitializer.java
+++ /dev/null
@@ -1,131 +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.core.annotations.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-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.JAXWSCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- *
- * @author sclarke
- *
- */
-public class ResponseWrapperAttributeInitializer extends AnnotationAttributeInitializer {
- private static final String CLASS_NAME = "className"; //$NON-NLS-1$
- private static final String LOCAL_NAME = "localName"; //$NON-NLS-1$
- private static final String TARGET_NAMESPACE = "targetNamespace"; //$NON-NLS-1$
-
- private static final String RESPONSE_SUFFIX = "Response"; //$NON-NLS-1$
-
- public ResponseWrapperAttributeInitializer() {
- }
-
- @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>();
- 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(AnnotationUtils.createCompletionProposal(getClassName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(LOCAL_NAME)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(getLocalName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(getTargetNamespace(type),
- memberValuePair.getValue()));
- }
- }
- return completionProposals;
- }
-
-
- private String getPackageName(IType type) {
- String packageName = type.getPackageFragment().getElementName();
- if (packageName == null || packageName.length() == 0) {
- packageName = "default_package"; //$NON-NLS-1$
- }
- return packageName += "."; //$NON-NLS-1$
- }
-
- private String getClassName(IType type, IMethod method) {
- try {
- String methodName = method.getElementName() + RESPONSE_SUFFIX;
- return getPackageName(type) + methodName.substring(0, 1).toUpperCase(Locale.getDefault())
- + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(type, method);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return "";
- }
-
- private String getLocalName(IType type, IMethod method) {
- try {
- return method.getElementName() + RESPONSE_SUFFIX + AnnotationUtils.accountForOverloadedMethods(type, method);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return "";
- }
-
- private String getTargetNamespace(IType type) {
- return JDTUtils.getTargetNamespaceFromPackageName(getPackageName(type));
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/SOAPBindingAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/SOAPBindingAttributeInitializer.java
deleted file mode 100644
index ac0dd98..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/SOAPBindingAttributeInitializer.java
+++ /dev/null
@@ -1,59 +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.core.annotations.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-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;
-
-/**
- *
- * @author sclarke
- *
- */
-public class SOAPBindingAttributeInitializer extends AnnotationAttributeInitializer {
- private static final String STYLE = "style";
- private static final String USE = "use";
- private static final String PARAMETER_STYLE = "parameterStyle";
-
- public SOAPBindingAttributeInitializer() {
- }
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- "javax.jws.soap.SOAPBinding", STYLE, Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- "javax.jws.soap.SOAPBinding", USE, Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- "javax.jws.soap.SOAPBinding", PARAMETER_STYLE, ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
- return memberValuePairs;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebMethodAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebMethodAttributeInitializer.java
deleted file mode 100644
index 0d770cc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebMethodAttributeInitializer.java
+++ /dev/null
@@ -1,110 +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.core.annotations.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-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.JAXWSCorePlugin;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebMethodAttributeInitializer extends AnnotationAttributeInitializer {
- private static final String OPERATION_NAME = "operationName";
- private static final String ACTION = "action";
-
- public WebMethodAttributeInitializer() {
- }
-
- @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(AnnotationUtils.createCompletionProposal(
- getOperationNameValue(type, method), memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(ACTION)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(
- getActionValue(type, method), memberValuePair.getValue()));
- }
-
- }
- return completionProposals;
- }
-
- private String getOperationNameValue(IType type, IMethod method) {
- try {
- return method.getElementName() + AnnotationUtils.accountForOverloadedMethods(type, method);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return "";
- }
-
- private String getActionValue(IType type, IMethod method) {
- try {
- String methodName = method.getElementName();
- return "urn:" + methodName.substring(0, 1).toUpperCase(Locale.getDefault())
- + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(type, method);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return "";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebParamAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebParamAttributeInitializer.java
deleted file mode 100644
index 85ce82d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebParamAttributeInitializer.java
+++ /dev/null
@@ -1,64 +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.core.annotations.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-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;
-/**
- *
- * @author sclarke
- *
- */
-public class WebParamAttributeInitializer extends AnnotationAttributeInitializer {
- private static final String NAME = "name";
-
- public WebParamAttributeInitializer() {
- }
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(ASTNode astNode, AST ast,
- Class<? extends Annotation> annotationClass) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME,
- getName((SingleVariableDeclaration)astNode));
- memberValuePairs.add(nameValuePair);
-
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(ASTNode astNode,
- MemberValuePair memberValuePair) {
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(
- getName((SingleVariableDeclaration)astNode), memberValuePair.getValue()));
- }
- return completionProposals;
- }
-
- private String getName(SingleVariableDeclaration parameter) {
- return parameter.getName().getIdentifier();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebResultAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebResultAttributeInitializer.java
deleted file mode 100644
index eb3794a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebResultAttributeInitializer.java
+++ /dev/null
@@ -1,63 +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.core.annotations.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-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;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebResultAttributeInitializer extends AnnotationAttributeInitializer {
- private static final String NAME = "name";
- private static final String RETURN = "return";
-
- public WebResultAttributeInitializer() {
- }
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, RETURN);
-
- memberValuePairs.add(nameValuePair);
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(RETURN, memberValuePair
- .getValue()));
- }
-
- return completionProposals;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebServiceAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebServiceAttributeInitializer.java
deleted file mode 100644
index deae271..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebServiceAttributeInitializer.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.core.annotations.initialization;
-
-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.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebServiceAttributeInitializer extends AnnotationAttributeInitializer {
- private static final String NAME = "name"; //$NON-NLS-1$
- private static final String PORT_NAME = "portName"; //$NON-NLS-1$
- private static final String SERVICE_NAME= "serviceName"; //$NON-NLS-1$
- private static final String ENDPOINT_INTERFACE = "endpointInterface"; //$NON-NLS-1$
- private static final String TARGET_NAMESPACE = "targetNamespace"; //$NON-NLS-1$
-
- private static final String PORT_SUFFIX = "Port"; //$NON-NLS-1$
- private static final String SERVICE_SUFFIX = "Service"; //$NON-NLS-1$
-
- public WebServiceAttributeInitializer() {
- }
-
- @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));
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
-
- if (type.isClass()) {
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
- }
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.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(AnnotationUtils.createCompletionProposal(anInterface,
- memberValuePair.getValue(), JavaUI.getSharedImages().getImage(
- ISharedImages.IMG_OBJS_INTERFACE)));
- }
- }
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(getName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(PORT_NAME)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(getPortName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(SERVICE_NAME)) {
- completionProposals.add(AnnotationUtils.createCompletionProposal(getServiceName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(AnnotationUtils.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) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return Collections.emptyList();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayNoReturnValueRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayNoReturnValueRule.java
deleted file mode 100644
index 0cc8e5c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayNoReturnValueRule.java
+++ /dev/null
@@ -1,63 +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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class OnewayNoReturnValueRule extends AbstractAnnotationProcessor {
-
- public OnewayNoReturnValueRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.Oneway"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
-
- if (declaration instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
- if (!methodDeclaration.getReturnType().equals(environment.getTypeUtils()
- .getVoidType())) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if ( mirror.getAnnotationType().toString().equals(annotationDeclaration
- .getQualifiedName())) {
- messager.printError(mirror.getPosition(), JAXWSCoreMessages
- .ONEWAY_ANNOTATION_PROCESSOR_NO_RETURN_VALUE_ERROR_MESSAGE);
- }
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodStyleDocumentRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodStyleDocumentRule.java
deleted file mode 100644
index a374d2e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodStyleDocumentRule.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.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.EnumConstantDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class SOAPBindingMethodStyleDocumentRule extends AbstractAnnotationProcessor {
-
- public SOAPBindingMethodStyleDocumentRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.soap.SOAPBinding"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof MethodDeclaration) {
-
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror mirror : annotationMirrors) {
- Map<AnnotationTypeElementDeclaration, AnnotationValue> valueMap = mirror
- .getElementValues();
- Set<Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue>> valueSet = valueMap
- .entrySet();
- for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> annotationKeyValue :
- valueSet) {
-
- if (annotationKeyValue.getKey().getSimpleName().equals("style")) { //$NON-NLS-1$
- if (annotationKeyValue.getValue() != null) {
- AnnotationValue annotationValue = annotationKeyValue.getValue();
- EnumConstantDeclaration enumConstantDeclaration =
- (EnumConstantDeclaration) annotationValue.getValue();
- if (!enumConstantDeclaration.getSimpleName().equals(
- javax.jws.soap.SOAPBinding.Style.DOCUMENT.name())) {
- messager.printError(mirror.getPosition(), JAXWSCoreMessages.
- SOAPBINDING_ANNOTATION_PROCESSOR_ON_METHOD_STYLE_DOCUMENT_ONLY_MESSAGE);
- }
- }
- }
- }
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodUseRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodUseRule.java
deleted file mode 100644
index 59aa3a1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodUseRule.java
+++ /dev/null
@@ -1,86 +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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.EnumConstantDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-
-/**
- *
- * @author ohurley
- *
- */
-public class SOAPBindingMethodUseRule extends AbstractAnnotationProcessor {
-
- public SOAPBindingMethodUseRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.soap.SOAPBinding"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(annotationDeclaration);
- boolean methodUseEncoded = false;
- boolean methodParameterStylePresent = false;
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof MethodDeclaration) {
-
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror mirror : annotationMirrors) {
- Map<AnnotationTypeElementDeclaration, AnnotationValue> valueMap = mirror
- .getElementValues();
- Set<Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue>> valueSet = valueMap
- .entrySet();
- for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> annotationKeyValue :
- valueSet) {
-
- if (annotationKeyValue.getKey().getSimpleName().equals("use")) { //$NON-NLS-1$
- if (annotationKeyValue.getValue() != null) {
- AnnotationValue annotationValue = annotationKeyValue.getValue();
- EnumConstantDeclaration enumConstantDeclaration =
- (EnumConstantDeclaration) annotationValue.getValue();
- if (enumConstantDeclaration.getSimpleName().equals(
- javax.jws.soap.SOAPBinding.Use.ENCODED.name())) {
- methodUseEncoded = true;
- }
- }
- } else {
- if (annotationKeyValue.getKey().getSimpleName().equals("parameterStyle")) { //$NON-NLS-1$
- methodParameterStylePresent = true;
- }
- }
-
- if (methodParameterStylePresent && methodUseEncoded) {
- messager.printError(mirror.getPosition(), JAXWSCoreMessages.
- SOAPBINDING_ANNOTATION_PROCESSOR_NO_PARAMETERSTYLE_WHEN_ENCODED_MESSAGE);
- return;
- }
- }
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.java
deleted file mode 100644
index 1eefd3f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.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.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebMethodCheckForWebServiceRule extends AbstractAnnotationProcessor {
- private static final String WEB_METHOD = "javax.jws.WebMethod";
- private static final String WEB_SERVICE = "javax.jws.WebService";
-
- public WebMethodCheckForWebServiceRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WEB_METHOD); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().getDeclaration().getQualifiedName().equals(WEB_METHOD)
- && !checkForWebServiceAnnotation(((MethodDeclaration)declaration).getDeclaringType())) {
- messager.printError(mirror.getPosition(), JAXWSCoreMessages
- .WEBMETHOD_ANNOTATION_PROCESSOR_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE_MESSAGE);
- }
- }
- }
- }
-
- private boolean checkForWebServiceAnnotation(TypeDeclaration typeDeclaration) {
- Collection<AnnotationMirror> annotationMirrors = typeDeclaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().toString().equals(WEB_SERVICE)) { //$NON-NLS-1$
- return true;
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.java
deleted file mode 100644
index 4676b6c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebMethodExcludeRules extends AbstractAnnotationProcessor {
-
- public WebMethodExcludeRules() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.WebMethod"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(
- annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror mirror : annotationMirrors) {
- Map<AnnotationTypeElementDeclaration, AnnotationValue> valueMap = mirror.getElementValues();
- Set<Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue>> valueSet = valueMap
- .entrySet();
- for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> annotationKeyValue :
- valueSet) {
-
- if (annotationKeyValue.getKey().getSimpleName().equals("exclude")) { //$NON-NLS-1$
- if (declaration instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration)declaration;
- if (methodDeclaration.getDeclaringType() instanceof InterfaceDeclaration) {
- messager.printError(mirror.getPosition(),
- JAXWSCoreMessages.WEBMETHOD_ANNOTATION_PROCESSOR_EXCLUDE_NOT_ALLOWED_ON_SEI);
- break;
- }
- }
-
- if (annotationKeyValue.getValue() != null) {
- AnnotationValue annotationValue = annotationKeyValue.getValue();
- if (annotationValue.getValue().toString().equals("true") && valueMap.size() > 1) {
- messager.printError(mirror.getPosition(), JAXWSCoreMessages.
- WEBMETHOD_ANNOTATION_PROCESSOR_EXCLUDE_SPECIFEID_NO_OTHER_ATTRIBUTES_ALLOWED_MESSAGE);
- }
- }
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicMethodsOnlyRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicMethodsOnlyRule.java
deleted file mode 100644
index 72177f5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicMethodsOnlyRule.java
+++ /dev/null
@@ -1,60 +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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.Modifier;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebMethodPublicMethodsOnlyRule extends AbstractAnnotationProcessor {
-
- public WebMethodPublicMethodsOnlyRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.WebMethod"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
-
- Collection<Modifier> modifiers = declaration.getModifiers();
- for (Modifier modifier : modifiers) {
- if (modifier.equals(Modifier.PRIVATE) || modifier.equals(Modifier.PROTECTED)) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if ( mirror.getAnnotationType().toString().equals(annotationDeclaration
- .getQualifiedName())) {
- messager.printError(mirror.getPosition(), JAXWSCoreMessages.
- WEBMETHOD_ANNOTATION_PROCESSOR_ONLY_ON_PUBLIC_METHODS_MESSAGE);
- }
- }
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceNoFinalizeMethodRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceNoFinalizeMethodRule.java
deleted file mode 100644
index 1e22694..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceNoFinalizeMethodRule.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.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebServiceNoFinalizeMethodRule extends AbstractAnnotationProcessor {
-
- public WebServiceNoFinalizeMethodRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.WebService"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (isFinalizeDefined(declaration)) {
- messager.printError(mirror.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ANNOTATION_PROCESSOR_OVERRIDE_FINALIZE_MESSAGE);
- }
- }
- }
- }
-
- private boolean isFinalizeDefined(Declaration declaration) {
- if (declaration instanceof TypeDeclaration) {
- TypeDeclaration typeDeclaration = (TypeDeclaration)declaration;
- Collection<? extends MethodDeclaration> methodDeclarations = typeDeclaration.getMethods();
- for (MethodDeclaration methodDeclaration : methodDeclarations) {
- if (methodDeclaration.getSimpleName().equals("finalize")
- && methodDeclaration.getParameters().size() == 0) {
- return true;
- }
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.java
deleted file mode 100644
index 92f5a2d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.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.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.Modifier;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebServicePublicAbstractFinalRule extends AbstractAnnotationProcessor {
-
- public WebServicePublicAbstractFinalRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.WebService"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof TypeDeclaration) {
- Collection<Modifier> modifiers = declaration.getModifiers();
- if (modifiers.contains(Modifier.FINAL) || modifiers.contains(Modifier.ABSTRACT)
- || !modifiers.contains(Modifier.PUBLIC)) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().toString()
- .equals(annotationDeclaration.getQualifiedName())) {
- messager.printError(mirror.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ANNOTATION_PROCESSOR_PUBLIC_ABSTRACT_FINAL_MESSAGE);
- }
- }
- }
- TypeDeclaration typeDeclaration = (TypeDeclaration)declaration;
- if (typeDeclaration.getNestedTypes().size() > 0) {
- testNestedTypes(typeDeclaration.getNestedTypes(), annotationDeclaration, messager);
- }
- }
- }
- }
-
- private void testNestedTypes(Collection<TypeDeclaration> nestedTypes,
- AnnotationTypeDeclaration annotationDeclaration, Messager messager) {
- for (TypeDeclaration nestedDeclaration : nestedTypes) {
- Collection<AnnotationMirror> annotationMirrors = nestedDeclaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().toString().equals(annotationDeclaration.getQualifiedName())) {
- messager.printError(mirror.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ANNOTATION_PROCESSOR_PUBLIC_ABSTRACT_FINAL_MESSAGE);
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIAllowedAttributesRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIAllowedAttributesRule.java
deleted file mode 100644
index 40139cb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIAllowedAttributesRule.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.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebServiceSEIAllowedAttributesRule extends AbstractAnnotationProcessor {
-
- public WebServiceSEIAllowedAttributesRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.WebService"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror mirror : annotationMirrors) {
- Map<AnnotationTypeElementDeclaration, AnnotationValue> valueMap = mirror.getElementValues();
- Set<Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue>> valueSet = valueMap
- .entrySet();
- for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> annotationKeyValue : valueSet) {
- if (declaration instanceof InterfaceDeclaration) {
- if (annotationKeyValue.getKey().getSimpleName().equals("serviceName")) { //$NON-NLS-1$
- messager.printError(mirror.getPosition(), JAXWSCoreMessages
- .WEBSERVICE_ANNOTATION_PROCESSOR_SERVICENAME_SEI_ERROR_MESSAGE);
- } else if (annotationKeyValue.getKey().getSimpleName().equals("endpointInterface")) { //$NON-NLS-1$
- messager.printError(mirror.getPosition(), JAXWSCoreMessages
- .WEBSERVICE_ANNOTATION_PROCESSOR_ENDPOINTINTERFACE_SEI_ERROR_MESSAGE);
- } else if (annotationKeyValue.getKey().getSimpleName().equals("portName")) { //$NON-NLS-1$
- messager.printError(mirror.getPosition(), JAXWSCoreMessages
- .WEBSERVICE_ANNOTATION_PROCESSOR_PORTNAME_SEI_ERROR_MESSAGE);
- }
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIPresentNoWebMethodRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIPresentNoWebMethodRule.java
deleted file mode 100644
index 03f4ebf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIPresentNoWebMethodRule.java
+++ /dev/null
@@ -1,84 +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.core.annotations.validation;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebServiceSEIPresentNoWebMethodRule extends AbstractAnnotationProcessor {
-
- public WebServiceSEIPresentNoWebMethodRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.WebService"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof ClassDeclaration) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror mirror : annotationMirrors) {
- Map<AnnotationTypeElementDeclaration, AnnotationValue> valueMap = mirror.getElementValues();
- Set<Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue>> valueSet = valueMap
- .entrySet();
- for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> annotationKeyValue : valueSet) {
- if (annotationKeyValue.getKey().getSimpleName().equals("endpointInterface")) { //$NON-NLS-1$
- checkWebMethods(messager);
- }
- }
- }
- }
- }
- }
-
- private void checkWebMethods(Messager messager) {
- AnnotationTypeDeclaration webMethodDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.WebMethod"); //$NON-NLS-1$
-
- Collection<Declaration> webMethodAnnotatedTypes = environment
- .getDeclarationsAnnotatedWith(webMethodDeclaration);
-
- for (Declaration declaration : webMethodAnnotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().toString().equals(webMethodDeclaration
- .getQualifiedName())) {
- messager.printError(mirror.getPosition(), JAXWSCoreMessages
- .WEBSERVICE_ANNOTATION_PROCESSOR_WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHOS_ERROR_MESSAGE);
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWebServiceProviderCoExistRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWebServiceProviderCoExistRule.java
deleted file mode 100644
index a3b56a1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWebServiceProviderCoExistRule.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.core.annotations.validation;
-
-import java.util.Collection;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-
-/**
- *
- * @author sclarke
- *
- */
-public class WebServiceWebServiceProviderCoExistRule extends AbstractAnnotationProcessor {
-
- public WebServiceWebServiceProviderCoExistRule() {
- }
-
- @Override
- public void process() {
- Messager messager = environment.getMessager();
-
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration("javax.jws.WebService"); //$NON-NLS-1$
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror mirror : annotationMirrors) {
- checkWebServiceProvider(mirror, messager);
- }
- }
- }
-
- private void checkWebServiceProvider(AnnotationMirror mirror, Messager messager) {
- if (mirror.getAnnotationType().toString().equals("javax.xml.ws.WebServiceProvider")) { //$NON-NLS-1$
- messager.printError(mirror.getPosition(), JAXWSCoreMessages
- .WEBSERVICE_ANNOTATION_PROCESSOR_WEBSERVICE_WEBSERVICEPROVIDER_ERROR_MESSAGE);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.java
deleted file mode 100644
index 962e2d4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.java
+++ /dev/null
@@ -1,333 +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.jaxws.core.utils;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-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.CompilationUnit;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-
-/**
- * JDT Utility class.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- */
-public final class JDTUtils {
-
- private JDTUtils() {
- }
-
- public static void addToClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
- try {
- List<IClasspathEntry> currentEntries = Arrays.asList(javaProject.getRawClasspath());
- List<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>();
- newEntries.addAll(currentEntries);
- if (classpathEntry != null && !newEntries.contains(classpathEntry)) {
- newEntries.add(classpathEntry);
- }
- javaProject.setRawClasspath(newEntries.toArray(new IClasspathEntry[newEntries.size()]),
- new NullProgressMonitor());
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- }
-
- public static void removeFromClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
- try {
- List<IClasspathEntry> currentEntries = Arrays.asList(javaProject.getRawClasspath());
- List<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>();
- newEntries.addAll(currentEntries);
- if (classpathEntry != null && newEntries.contains(classpathEntry)) {
- newEntries.remove(classpathEntry);
- }
- javaProject.setRawClasspath(newEntries.toArray(new IClasspathEntry[newEntries.size()]),
- new NullProgressMonitor());
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- }
-
- public static IStatus checkTypeExists(IType type, String compilationUnitName) {
- compilationUnitName = compilationUnitName.trim();
-
- IPackageFragment packageFragment = type.getPackageFragment();
- ICompilationUnit compilationUnit = packageFragment.getCompilationUnit(compilationUnitName);
- IResource resource = compilationUnit.getResource();
-
- if (resource.exists()) {
- return new Status(IStatus.ERROR, JAXWSCorePlugin.PLUGIN_ID, JAXWSCoreMessages
- .bind(JAXWSCoreMessages.TYPE_WITH_NAME_ALREADY_EXISTS, new Object[] {
- compilationUnitName, packageFragment.getElementName() }));
- }
- URI location = resource.getLocationURI();
- if (location != null) {
- try {
- IFileStore fileStore = EFS.getStore(location);
- if (fileStore.fetchInfo().exists()) {
- return new Status(IStatus.ERROR, JAXWSCorePlugin.PLUGIN_ID,
- JAXWSCoreMessages.TYPE_NAME_DIFFERENT_CASE_EXISTS);
- }
- } catch (CoreException ce) {
- JAXWSCorePlugin.log(ce.getStatus());
- }
- }
- return Status.OK_STATUS;
- }
-
- public static String getClassName(String projectName, String fullyQualifiedClassName) {
- return JDTUtils.getType(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName)
- .getElementName();
- }
-
- public static IJavaProject getJavaProject(IProject project) {
- IJavaProject javaProject = JavaCore.create(project);
- return javaProject;
- }
-
- public static IJavaProject getJavaProject(String projectName) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- return JDTUtils.getJavaProject(project);
- }
-
- public static String getJavaProjectOutputDirectoryPath(IJavaProject javaProject) {
- IPath outputPath;
- String fullPath = ""; //$NON-NLS-1$
- try {
- outputPath = javaProject.getOutputLocation();
- fullPath = ResourcesPlugin.getWorkspace().getRoot().findMember(outputPath).getLocation()
- .toOSString();
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return fullPath;
- }
-
- public static String getJavaProjectOutputDirectoryPath(String projectName) {
- return JDTUtils.getJavaProjectOutputDirectoryPath(JDTUtils.getJavaProject(projectName));
- }
-
- public static String getJavaProjectSourceDirectoryPath(IJavaProject javaProject,
- String fullyQualifiedClassName) {
-
- IType type = JDTUtils.getType(javaProject, fullyQualifiedClassName);
- IPackageFragment packageFragment = type.getPackageFragment();
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot)packageFragment.getParent();
- IResource srcDirectoryResource = packageFragmentRoot.getResource();
- return srcDirectoryResource.getFullPath().toOSString();
- }
-
- public static String getJavaProjectSourceDirectoryPath(String projectName,
- String fullyQualifiedClassName) {
- return JDTUtils.getJavaProjectSourceDirectoryPath(JDTUtils.getJavaProject(projectName),
- fullyQualifiedClassName);
- }
-
- public static String getJavaProjectSourceDirectoryPath(String projectName) {
- return JDTUtils.getJavaProjectSourceDirectoryPath(JDTUtils.getJavaProject(projectName));
- }
-
- public static String getJavaProjectSourceDirectoryPath(IProject project) {
- return JDTUtils.getJavaProjectSourceDirectoryPath(JDTUtils.getJavaProject(project));
- }
-
- public static String getJavaProjectSourceDirectoryPath(IJavaProject javaProject) {
- try {
- IPackageFragmentRoot[] packageFragmentRoots = javaProject.getAllPackageFragmentRoots();
- IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[0];
- IResource srcDirectoryResource = packageFragmentRoot.getResource();
- return srcDirectoryResource.getFullPath().toOSString();
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- public static String getPackageNameFromClass(IJavaProject javaProject, String fullyQualifiedClassName) {
- return JDTUtils.getType(javaProject, fullyQualifiedClassName).getPackageFragment().getElementName();
- }
-
- public static String getPackageNameFromClass(String projectName, String fullyQualifiedClassName) {
- return JDTUtils
- .getPackageNameFromClass(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName);
- }
-
- public static IMethod[] getPublicMethods(IType type) {
- List<IMethod> publicMethods = new ArrayList<IMethod>();
- try {
- IMethod[] allMethods = type.getMethods();
- for (int i = 0; i < allMethods.length; i++) {
- IMethod method = allMethods[i];
- if (Flags.isPublic(method.getFlags()) && !method.isConstructor() && !method.isMainMethod()) {
- publicMethods.add(method);
- }
- }
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return publicMethods.toArray(new IMethod[publicMethods.size()]);
- }
-
- public static String getSourceFromType(IType type) {
- try {
- return type.getCompilationUnit().getBuffer().getContents();
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- public static String getTargetNamespaceFromPackageName(String packageName) {
- if (packageName == null || packageName.length() == 0) {
- return "http://default_package/"; //$NON-NLS-1$
- }
- List<String> namespaceElements = Arrays.asList(packageName.split("\\.")); //$NON-NLS-1$
- Collections.reverse(namespaceElements);
- String targetNamespace = "http://"; //$NON-NLS-1$
-
- Iterator<String> namespaceIterator = namespaceElements.iterator();
- while (namespaceIterator.hasNext()) {
- String element = namespaceIterator.next();
- if (element.trim().length() > 0) {
- targetNamespace += element;
- if (namespaceIterator.hasNext()) {
- targetNamespace += "."; //$NON-NLS-1$
- }
- }
- }
- targetNamespace += "/"; //$NON-NLS-1$
- return targetNamespace;
- }
-
- public static IType getType(IJavaProject javaProject, String fullyQualifiedClassName) {
- try {
- return javaProject.findType(fullyQualifiedClassName);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return null;
- }
-
- public static IType getType(IProject project, String fullyQualifiedClassName) {
- return JDTUtils.getType(JDTUtils.getJavaProject(project), fullyQualifiedClassName);
- }
-
- public static IType getType(String projectName, String fullyQualifiedClassName) {
- return JDTUtils.getType(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName);
- }
-
- public static boolean isJavaProject(IProject project) {
- try {
- return project.hasNature(JavaCore.NATURE_ID);
- } catch (CoreException ce) {
- JAXWSCorePlugin.log(ce.getStatus());
- }
- return false;
- }
-
- public static boolean isPublicMethod(IMethod method) {
- try {
- return Flags.isPublic(method.getFlags()) && !method.isConstructor() && !method.isMainMethod();
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return false;
- }
-
- public static IStatus validateJavaTypeName(String projectName, String compilationUnitName) {
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- String sourceLevel = javaProject.getOption(JavaCore.COMPILER_SOURCE, true);
- String complianceLevel = javaProject.getOption(JavaCore.COMPILER_COMPLIANCE, true);
- return JavaConventions.validateJavaTypeName(compilationUnitName, sourceLevel, complianceLevel);
- }
-
- public static IStatus validatePackageName(String projectName, String packageName) {
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- String sourceLevel = javaProject.getOption(JavaCore.COMPILER_SOURCE, true);
- String complianceLevel = javaProject.getOption(JavaCore.COMPILER_COMPLIANCE, true);
- return JavaConventions.validatePackageName(packageName, sourceLevel, complianceLevel);
- }
-
- public static ICompilationUnit getCompilationUnitFromFile(IFile file) {
- IProject project = file.getProject();
- try {
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
- IPackageFragmentRoot[] packageFragmentRoots = javaProject.getPackageFragmentRoots();
- for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
- if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
- IJavaElement[] packageFragments = packageFragmentRoot.getChildren();
- for (IJavaElement javaElement : packageFragments) {
- if (javaElement.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
- IPackageFragment packageFragment = (IPackageFragment)javaElement;
- ICompilationUnit[] compilationUnits = packageFragment.getCompilationUnits();
- for (ICompilationUnit compilationUnit : compilationUnits) {
- if (compilationUnit.getPath().equals(file.getFullPath())) {
- return compilationUnit;
- }
- }
- }
- }
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- } catch (CoreException ce) {
- JAXWSCorePlugin.log(ce.getStatus());
- }
- return null;
- }
-
- public static CompilationUnit getCompilationUnit(ICompilationUnit source) {
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(source);
- CompilationUnit compilationUnit = (CompilationUnit) parser.createAST(new NullProgressMonitor());
- compilationUnit.recordModifications();
-
- return compilationUnit;
- }
-}
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 2d1a430..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.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.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 2e0e38f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/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.ui;singleton:=true
-Bundle-Version: 0.5.1.qualifier
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.ui.editors,
- org.eclipse.jdt.launching,
- org.eclipse.jst.ws.annotations.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
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/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/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/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/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
deleted file mode 100644
index 7970788..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
+++ /dev/null
@@ -1,17 +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.org
-
-ANNOTATIONS_VIEW_CATEGORY_NAME=JAX-WS
-ANNOTATIONS_VIEW_NAME=Annotation Properties
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 40794f7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml
+++ /dev/null
@@ -1,51 +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 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>
-</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 85e0974..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java
+++ /dev/null
@@ -1,51 +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;
-
-/**
- * @author sclarke
- */
-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;
-
- 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 0a8f77d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties
+++ /dev/null
@@ -1,32 +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
-
-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>.
\ No newline at end of file
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 8c7022e..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.getLocalizedMessage(),
- 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 600fdc6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.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.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;
-
-/**
- * @author sclarke
- *
- */
-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 5caaf87..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
+++ /dev/null
@@ -1,192 +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.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-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;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- *
- * @author sclarke
- *
- */
-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();
- }
-
- @SuppressWarnings("unchecked")
- private List<ICompletionProposal> computeCompletionProposals(JavaContentAssistInvocationContext context) {
- CompletionContext completionContext = context.getCoreContext();
- int tokenStart = completionContext.getTokenStart();
-
- ICompilationUnit source = context.getCompilationUnit();
- try {
- IJavaElement javaElement = source.getElementAt(tokenStart);
- if (javaElement != null) {
-
- CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
- int elementType = javaElement.getElementType();
-
- if (elementType == IJavaElement.PACKAGE_DECLARATION) {
- PackageDeclaration packageDeclaration = compilationUnit.getPackage();
- List<Annotation> packageAnnotations = packageDeclaration.annotations();
- for (Annotation annotation : packageAnnotations) {
- if (annotation instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation,
- tokenStart);
- if (memberValuePair != null) {
- return getCompletionProposalsForASTNode(normalAnnotation, memberValuePair,
- packageDeclaration);
- }
- }
- }
- }
- if (elementType == IJavaElement.TYPE || elementType == IJavaElement.FIELD) {
- return getCompletionProposalsForJavaElement(AnnotationUtils.getExtendedModifiers(
- compilationUnit, javaElement), javaElement, tokenStart);
- }
-
- if (elementType == IJavaElement.METHOD) {
- SingleVariableDeclaration parameter = AnnotationUtils.getMethodParameter(compilationUnit,
- (IMethod)javaElement, tokenStart);
- if (parameter != null) {
- return getCompletionProposalsForASTNode(parameter.modifiers(), parameter, tokenStart);
- } else {
- return getCompletionProposalsForJavaElement(AnnotationUtils.getExtendedModifiers(
- compilationUnit, javaElement), javaElement, tokenStart);
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForASTNode(List<IExtendedModifier> modifiers,
- ASTNode astNode, int offset) {
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier.isAnnotation() && extendedModifier instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;
- MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation, offset);
- if(memberValuePair != null) {
- return getCompletionProposalsForASTNode(normalAnnotation, memberValuePair,
- astNode);
- }
- }
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(List<IExtendedModifier> modifiers,
- IJavaElement javaElement, int offset) {
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier.isAnnotation() && extendedModifier instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;
- MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation, offset);
- if(memberValuePair != null) {
- return getCompletionProposalsForJavaElement(normalAnnotation, memberValuePair,
- javaElement);
- }
- }
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForASTNode(NormalAnnotation normalAnnotation,
- MemberValuePair memberValuePair, ASTNode astNode) {
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager
- .getAnnotationAttributeInitializerForName(normalAnnotation.getTypeName());
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getCompletionProposalsForMemberValuePair(astNode,
- memberValuePair);
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(NormalAnnotation normalAnnotation,
- MemberValuePair memberValuePair, IJavaElement javaElement) {
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager
- .getAnnotationAttributeInitializerForName(normalAnnotation.getTypeName());
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getCompletionProposalsForMemberValuePair(javaElement,
- memberValuePair);
- }
- 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;
- }
-
- @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/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 c2043d0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java
+++ /dev/null
@@ -1,552 +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;
-
-/**
- * @author sclarke
- */
-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;
- }
-
- @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(componentType.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();
- // if (button..getStyle() == SWT.CHECK) {
- 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 = (Map<String, Object>)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.FILL, true, true);
- if (returnType.equals(String.class)) {
- Text text = new Text(typeComposite, SWT.BORDER);
- text.setData(method);
- gridData.horizontalSpan = 2;
- text.setLayoutData(gridData);
- if (defaultValue != null) {
- text.setText(defaultValue.toString());
- }
- controls.put(method.getName(), text);
- }
- if (returnType.equals(Class.class)) {
- final Text text = new Text(typeComposite, SWT.BORDER);
- text.setData(method);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- text.setLayoutData(gridData);
- if (defaultValue != null) {
- Class<?> classValue = (Class<?>)defaultValue;
- text.setText(classValue.getCanonicalName() + ".class");
- }
- 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);
- }
- if (returnType.isArray()) {
- Label notSupportLabel = new Label(typeComposite, SWT.NONE);
- notSupportLabel.setText(
- JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 2;
- notSupportLabel.setLayoutData(gridData);
- }
- 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() {
- }
- }
-
-}
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 f46f649..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java
+++ /dev/null
@@ -1,51 +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;
-
-/**
- *
- * @author sclarke
- *
- */
-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 2dde0eb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java
+++ /dev/null
@@ -1,283 +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.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-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;
-
-/**
- *
- * @author sclarke
- *
- */
-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) {
- String text = ""; //$NON-NLS-1$
- if (element instanceof Method) {
- text = getTextForMethod((Method)element);
- }
- return text;
- }
-
- private String getTextForMethod(Method method) {
- String text = ""; //$NON-NLS-1$
- if (annotationTreeViewer.getInput() instanceof IAnnotatable) {
- text = getTextForMethod(method, (IAnnotatable) annotationTreeViewer.getInput());
- } else if (annotationTreeViewer.getInput() instanceof SingleVariableDeclaration) {
- text = getTextForMethod(method, (SingleVariableDeclaration)annotationTreeViewer.getInput());
- }
- return text;
- }
-
- private String getTextForMethod(Method method, IAnnotatable annotatedElement) {
- Class<?> returnType = method.getReturnType();
- try {
- IAnnotation[] annotations = annotatedElement.getAnnotations();
- for (IAnnotation annotation : annotations) {
- Class<?> declaringClass = method.getDeclaringClass();
- if (annotation.getElementName().equals(declaringClass.getSimpleName())
- || annotation.getElementName().equals(declaringClass.getCanonicalName())) {
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getValue() == null) {
- break;
- }
- if (memberValuePair.getMemberName().equals(method.getName())) {
- if (returnType.equals(String.class)) {
- return memberValuePair.getValue().toString();
- }
-
- if (returnType.equals(Class.class)) {
- return memberValuePair.getValue().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 memberValuePair.getValue().toString();
- }
-
- if (returnType.isArray()) {
- Object[] values = (Object[])memberValuePair.getValue();
- if (values != null && values.length > 0) {
- return "[]{...}"; //$NON-NLS-1$
- } else {
- return "[]{}"; //$NON-NLS-1$
- }
- }
-
- if (returnType.isEnum()) {
- String enumValue = memberValuePair.getValue().toString();
- return enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
- }
- }
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- @SuppressWarnings("unchecked")
- private String getTextForMethod(Method method, SingleVariableDeclaration singleVariableDeclaration) {
- Class<?> returnType = method.getReturnType();
- List<IExtendedModifier> modifiers = singleVariableDeclaration.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;
- String annotationName = AnnotationUtils.getAnnotationName(normalAnnotation);
- Class<?> declaringClass = method.getDeclaringClass();
- if (annotationName.equals(declaringClass.getSimpleName()) ||
- annotationName.equals(declaringClass.getCanonicalName())) {
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().toString().equals(method.getName())) {
- if (returnType.equals(String.class)) {
- StringLiteral stringLiteral = (StringLiteral)memberValuePair.getValue();
- return stringLiteral.getLiteralValue();
- }
-
- 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 memberValuePair.getValue().toString();
- }
-
- if (returnType.isEnum()) {
- String enumValue = memberValuePair.getValue().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 IAnnotatable) {
- return getImageForClass(aClass, (IAnnotatable) annotationTreeViewer.getInput());
- }
-
- if (annotationTreeViewer.getInput() instanceof SingleVariableDeclaration) {
- return getImageForClass(aClass, (SingleVariableDeclaration)annotationTreeViewer.getInput());
- }
- return false_image;
- }
-
- private Image getImageForClass(Class<?> aClass, IAnnotatable annotatedElement) throws JavaModelException {
- 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 true_image;
- }
- }
- return false_image;
- }
-
- @SuppressWarnings("unchecked")
- private Image getImageForClass(Class<?> aClass, SingleVariableDeclaration parameter) {
- List<IExtendedModifier> modifiers = parameter.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof Annotation) {
- Annotation annotation = (Annotation) extendedModifier;
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- if (AnnotationUtils.isAnnotationPresent(parameter, annotation)
- && (annotationName.equals(aClass.getSimpleName())
- || annotationName.equals(aClass.getCanonicalName()))) {
- return true_image;
- }
- }
- }
- return false_image;
- }
-
- private Image getImageForMethod(Method method) throws JavaModelException {
- Class<?> returnType = method.getReturnType();
- if (returnType.equals(Boolean.TYPE)) {
- if (annotationTreeViewer.getInput() instanceof IAnnotatable) {
- return getImageForMethod(method, (IAnnotatable) annotationTreeViewer.getInput());
- }
- if (annotationTreeViewer.getInput() instanceof SingleVariableDeclaration) {
- return getImageForMethod(method, (SingleVariableDeclaration)annotationTreeViewer.getInput());
- }
- }
- return null;
- }
-
- private Image getImageForMethod(Method method, IAnnotatable annotatedElement) throws JavaModelException {
- IAnnotation[] annotations = annotatedElement.getAnnotations();
- for (IAnnotation annotation : annotations) {
- String annotationName = annotation.getElementName();
- Class<?> declaringClass = method.getDeclaringClass();
- if (annotationName.equals(declaringClass.getSimpleName())
- || annotationName.equals(declaringClass.getCanonicalName())) {
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getMemberName().equals(method.getName())) {
- if (Boolean.parseBoolean(memberValuePair.getValue().toString())) {
- return true_image;
- }
- }
- }
- }
- }
- return false_image;
- }
-
- @SuppressWarnings("unchecked")
- private Image getImageForMethod(Method method, SingleVariableDeclaration singleVariableDeclaration)
- throws JavaModelException {
- List<IExtendedModifier> modifiers = singleVariableDeclaration.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof NormalAnnotation) {
- NormalAnnotation annotation = (NormalAnnotation) extendedModifier;
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- Class<?> declaringClass = method.getDeclaringClass();
- if (annotationName.equals(declaringClass.getSimpleName())
- || annotationName.equals(declaringClass.getCanonicalName())) {
- List<MemberValuePair> memberValuePairs = annotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().toString().equals(method.getName())) {
- BooleanLiteral booleanLiteral = (BooleanLiteral)memberValuePair.getValue();
- if (booleanLiteral.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 371137f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java
+++ /dev/null
@@ -1,747 +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.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-
-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.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-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.Annotation;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.QualifiedName;
-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.rewrite.ASTRewrite;
-import org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
-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.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.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.ltk.ui.refactoring.RefactoringUI;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author sclarke
- *
- */
-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());
- }
- if (treeViewer.getInput() instanceof SingleVariableDeclaration) {
- return getValueForClass(aClass, (SingleVariableDeclaration) 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;
- }
-
- @SuppressWarnings("unchecked")
- private Object getValueForClass(Class<?> aClass, SingleVariableDeclaration parameter) {
- List<IExtendedModifier> modifiers = parameter.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof Annotation) {
- Annotation annotation = (Annotation) extendedModifier;
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- if (AnnotationUtils.isAnnotationPresent(parameter, annotation)
- && (annotationName.equals(aClass.getSimpleName())
- || annotationName.equals(aClass.getCanonicalName()))) {
- return Boolean.TRUE;
- }
- }
- }
- return Boolean.FALSE;
- }
-
- private Object getValueForMethod(Method method) {
- Object value = null;
- try {
- if (treeViewer.getInput() instanceof IAnnotatable) {
- value = getValueForMethod(method, (IAnnotatable) treeViewer.getInput());
- } else if (treeViewer.getInput() instanceof SingleVariableDeclaration) {
- value = getValueForMethod(method, (SingleVariableDeclaration) 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";
- }
- return arrayValues;
- }
- return memberValuePair.getValue();
- }
- }
- }
- return getDefaultValueForMethod(returnType);
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private Object getValueForMethod(Method method, SingleVariableDeclaration parameter) {
- Class<?> returnType = method.getReturnType();
- List<IExtendedModifier> modifiers = parameter.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;
- Class<?> declaringClass = method.getDeclaringClass();
- String annotationName = AnnotationUtils.getAnnotationName(normalAnnotation);
- if (annotationName.equals(declaringClass.getSimpleName())
- || annotationName.equals(declaringClass.getCanonicalName())) {
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().toString().equals(method.getName())) {
- if (returnType.equals(String.class)) {
- StringLiteral stringLiteral = (StringLiteral) memberValuePair
- .getValue();
- return stringLiteral.getLiteralValue();
- }
-
- if (returnType.isEnum()) {
- QualifiedName enumValue = (QualifiedName) memberValuePair
- .getValue();
- SimpleName literal = enumValue.getName();
- 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)) {
- BooleanLiteral booleanLiteral = (BooleanLiteral) memberValuePair
- .getValue();
- return booleanLiteral.booleanValue();
- }
- }
- }
- 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<? extends java.lang.annotation.Annotation> annotationClass =
- AnnotationsManager.getAnnotationDefinitionForClass(element).getAnnotationClass();
-
- 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 IPackageDeclaration) {
- setValueForClass(annotationClass, annotate, (IPackageDeclaration) viewerInput,
- annotationAttributeInitializer);
- } else if (viewerInput instanceof IMember) {
- setValueForClass(annotationClass, annotate, (IMember) viewerInput, annotationAttributeInitializer);
- } else if (viewerInput instanceof SingleVariableDeclaration) {
- setValueForClass(annotationClass, annotate, (SingleVariableDeclaration) viewerInput,
- annotationAttributeInitializer);
- }
- }
-
- private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
- Boolean annotate, IPackageDeclaration packageDeclaration,
- IAnnotationAttributeInitializer annotationAttributeInitializer) throws CoreException {
-
- ICompilationUnit source = JDTUtils.getCompilationUnitFromFile((IFile)packageDeclaration.getResource());
- CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
-
- PackageDeclaration pkgDeclaration = compilationUnit.getPackage();
-
- AST ast = pkgDeclaration.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- List<MemberValuePair> memberValueParis = getMemberValuePairs(annotationAttributeInitializer,
- pkgDeclaration, ast, annotationClass);
-
- Annotation annotation = AnnotationsCore.createAnnotation(ast, annotationClass,
- annotationClass.getSimpleName(), memberValueParis);
-
- TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
- if (annotate) {
- AnnotationUtils.createPackageDeclarationAnnotationChange(source, pkgDeclaration, rewriter,
- annotation, textFileChange);
- } else {
- AnnotationUtils.removeAnnotationFromPackageDeclaration(source, pkgDeclaration, rewriter,
- annotation, textFileChange);
- }
-
- AnnotationUtils.getImportChange(compilationUnit, annotationClass, textFileChange, annotate);
-
- executeChange(new NullProgressMonitor(), textFileChange);
- }
-
- private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
- Boolean annotate, IMember member, IAnnotationAttributeInitializer annotationAttributeInitializer)
- throws CoreException {
- ICompilationUnit source = member.getCompilationUnit();
- CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
- AST ast = compilationUnit.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- List<MemberValuePair> memberValueParis = getMemberValuePairs(annotationAttributeInitializer, member,
- ast, annotationClass);
-
- Annotation annotation = AnnotationsCore.createAnnotation(ast, annotationClass,
- annotationClass.getSimpleName(), memberValueParis);
-
- TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
- if (annotate) {
- if (member.getElementType() == IJavaElement.TYPE) {
- AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter,
- annotation, textFileChange);
- } else if (member.getElementType() == IJavaElement.METHOD) {
- AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter,
- (IMethod) member, annotation, textFileChange);
- } else if (member.getElementType() == IJavaElement.FIELD) {
- AnnotationUtils.createFiedlAnnotationChange(source, compilationUnit, rewriter,
- (IField) member, annotation, textFileChange);
- }
- } else {
- if (member.getElementType() == IJavaElement.PACKAGE_DECLARATION) {
-
- }
- if (member.getElementType() == IJavaElement.TYPE) {
- AnnotationUtils.removeAnnotationFromType(source, compilationUnit, rewriter,
- annotation, textFileChange);
- } else if (member.getElementType() == IJavaElement.METHOD) {
- AnnotationUtils.removeAnnotationFromMethod(source, compilationUnit, rewriter,
- (IMethod) member, annotation, textFileChange);
- } else if (member.getElementType() == IJavaElement.FIELD) {
- AnnotationUtils.removeAnnotationFromField(source, compilationUnit, rewriter,
- (IField) member, annotation, textFileChange);
- }
- }
-
- AnnotationUtils.getImportChange(compilationUnit, annotationClass, textFileChange, annotate);
-
- executeChange(new NullProgressMonitor(), textFileChange);
- }
-
- private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
- Boolean annotate, SingleVariableDeclaration parameter,
- IAnnotationAttributeInitializer annotationAttributeInitializer) throws CoreException {
- ITextEditor txtEditor = (ITextEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage().getActiveEditor();
- IFile file = ((IFileEditorInput) txtEditor.getEditorInput()).getFile();
- ICompilationUnit source = JDTUtils.getCompilationUnitFromFile(file);
-
- CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
- AST ast = parameter.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- List<MemberValuePair> memberValueParis = getMemberValuePairs(annotationAttributeInitializer,
- parameter, ast, annotationClass);
-
- Annotation annotation = AnnotationsCore.createAnnotation(ast, annotationClass,
- annotationClass.getSimpleName(), memberValueParis);
-
- TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
- if (annotate) {
- AnnotationUtils.createMethodParameterAnnotationChange(source, rewriter, parameter, annotation,
- textFileChange);
- } else {
- AnnotationUtils.removeAnnotationFromMethodParameter(source, rewriter, parameter, annotation,
- textFileChange);
- }
- AnnotationUtils.getImportChange(compilationUnit, annotationClass, textFileChange, annotate);
-
- executeChange(new NullProgressMonitor(), textFileChange);
- }
-
- private List<MemberValuePair> getMemberValuePairs(
- IAnnotationAttributeInitializer annotationAttributeInitializer, ASTNode astNode, AST ast,
- Class<?extends java.lang.annotation.Annotation> annotationClass) {
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getMemberValuePairs(astNode, ast, annotationClass);
- }
- return Collections.emptyList();
- }
-
- 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);
- } else if (treeViewer.getInput() instanceof SingleVariableDeclaration) {
- setValueForMethod(method, value, (SingleVariableDeclaration) treeViewer.getInput());
- }
- }
- }
-
- private ICompilationUnit getCompilationUnitForType(IJavaElement javaElement) throws JavaModelException {
- int elementType = javaElement.getElementType();
- if (elementType == IJavaElement.TYPE) {
- IType type = (IType)javaElement.getPrimaryElement();
- return type.getCompilationUnit();
- }
- if (elementType == IJavaElement.METHOD) {
- IMethod method = (IMethod)javaElement.getPrimaryElement();
- return method.getCompilationUnit();
- }
- if (elementType == IJavaElement.FIELD) {
- IField field = (IField)javaElement.getPrimaryElement();
- return field.getCompilationUnit();
- }
- return JDTUtils.getCompilationUnitFromFile((IFile)javaElement.getCorrespondingResource());
- }
-
- private void setValueForMethod(Method method, Object value, IJavaElement javaElement) throws CoreException {
- ICompilationUnit source = getCompilationUnitForType(javaElement);
- CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
- AST ast = compilationUnit.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
- IAnnotatable annotatedElement = (IAnnotatable) javaElement;
- 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();
- boolean hasMemberValuePair = false;
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getMemberName().equals(method.getName())) {
- ASTNode memberValue = getMemberValuePairValue(ast, method, value);
- if (memberValue != null) {
- AnnotationUtils.updateMemberVaulePairValue(source,
- compilationUnit, rewriter, javaElement, annotation,
- memberValuePair, memberValue, textFileChange);
- hasMemberValuePair = true;
- break;
- }
- }
- }
- if (!hasMemberValuePair) {
- ASTNode memberVaulePair = getMemberValuePair(ast, method, value);
- if (memberVaulePair != null) {
- AnnotationUtils
- .createMemberVaulePairChange(source, compilationUnit,
- rewriter, javaElement, annotation, memberVaulePair,
- textFileChange);
- break;
- }
- }
- }
- }
- executeChange(new NullProgressMonitor(), textFileChange);
- }
-
- @SuppressWarnings("unchecked")
- private void setValueForMethod(Method method, Object value, SingleVariableDeclaration parameter)
- throws CoreException {
- ITextEditor txtEditor = (ITextEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage().getActiveEditor();
- IFile file = ((IFileEditorInput) txtEditor.getEditorInput()).getFile();
- ICompilationUnit source = JDTUtils.getCompilationUnitFromFile(file);
-
- CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
- AST ast = parameter.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
- List<IExtendedModifier> modifiers = parameter.modifiers();
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;
- String annotationName = AnnotationUtils.getAnnotationName(normalAnnotation);
- Class<?> declaringClass = method.getDeclaringClass();
- if (annotationName.equals(declaringClass.getSimpleName())
- || annotationName.equals(declaringClass.getCanonicalName())) {
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- boolean hasMemberValuePair = false;
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().toString().equals(method.getName())) {
- ASTNode memberValue = getMemberValuePairValue(ast, method, value);
- if (memberValue != null) {
- AnnotationUtils.updateMemberVaulePairValue(source, compilationUnit, rewriter,
- normalAnnotation, memberValuePair, memberValue, textFileChange);
- hasMemberValuePair = true;
- break;
- }
- }
- }
- if (!hasMemberValuePair) {
- ASTNode memberValuePair = getMemberValuePair(ast, method, value);
- if (memberValuePair != null) {
- AnnotationUtils.createMemberVaulePairChange(source, compilationUnit, rewriter,
- normalAnnotation, memberValuePair, textFileChange);
- break;
- }
- }
- }
- }
- }
- executeChange(new NullProgressMonitor(), textFileChange);
- }
-
- 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()) {
- return AnnotationsCore.createArrayValueLiteral(ast, method, (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 ASTNode getMemberValuePair(AST ast, Method method, Object value) {
- Class<?> returnType = method.getReturnType();
- if (returnType.equals(String.class)) {
- return AnnotationsCore.createStringMemberValuePair(ast, method.getName(), value);
- }
- if (returnType.equals(Boolean.TYPE)) {
- return AnnotationsCore.createBooleanMemberValuePair(ast, method.getName(), 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()) {
- return AnnotationsCore.createArrayMemberValuePair(ast, method, (Object[]) value);
- }
-
- if (returnType.equals(Class.class)) {
- return AnnotationsCore.createTypeMemberVaulePair(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;
- }
-
- @SuppressWarnings("restriction")
- private void executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return;
- }
-
- change.initializeValidationData(monitor);
-
- PerformChangeOperation changeOperation = RefactoringUI.createUIAwareChangeOperation(change);
-
- WorkbenchRunnableAdapter adapter = new WorkbenchRunnableAdapter(changeOperation);
- try {
- PlatformUI.getWorkbench().getProgressService().runInUI(new BusyIndicatorRunnableContext(), adapter,
- adapter.getSchedulingRule());
- } catch (InvocationTargetException ite) {
- JAXWSUIPlugin.log(ite);
- } catch (InterruptedException ie) {
- JAXWSUIPlugin.log(ie);
- }
-
- annotationsView.refresh();
- }
-}
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 a1d4066..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java
+++ /dev/null
@@ -1,469 +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.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-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.jst.ws.jaxws.core.utils.JDTUtils;
-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;
-
-/**
- *
- * @author sclarke
- *
- */
-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() {
- }
-
- 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) {
- return AnnotationsManager.getAnnotationDefinitionForClass(obj1).getAnnotationClassName().
- compareTo(AnnotationsManager.getAnnotationDefinitionForClass(obj2).
- getAnnotationClassName());
- }
- if (obj1 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();
- IWorkbenchPartReference workbenchPartReference = workbenchPage.getActivePartReference();
-
- if ( 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 = JDTUtils.getCompilationUnitFromFile(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$
- annotationTreeViewer.setInput((IPackageDeclaration) 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()) {
- annotationTreeViewer.setInput(type);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IField field = (IField)javaElement;
- if (!field.getDeclaringType().isMember()) {
- annotationTreeViewer.setInput(field);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- if (!method.getDeclaringType().isMember()) {
- SingleVariableDeclaration parameter = AnnotationUtils
- .getMethodParameter(null, method, offset);
- if (parameter != null) {
- annotationTreeViewer.setInput(parameter);
- } else {
- annotationTreeViewer.setInput(method);
- }
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
- annotationTreeViewer.refresh();
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
-
- annotationTreeViewer.setExpandedTreePaths(expandedTreePaths);
- }
-
- 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.
- */
- public void setFocus() {
- annotationTreeViewer.getControl().setFocus();
- }
-
- 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 = JDTUtils
- .getCompilationUnitFromFile(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 bf1e0de..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java
+++ /dev/null
@@ -1,94 +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.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;
-
-/**
- *
- * @author sclarke
- *
- */
-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) {
- AnnotationDefinition annotationDefinition = AnnotationsManager.
- getAnnotationDefinitionForClass(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 033e0ee..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java
+++ /dev/null
@@ -1,56 +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.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-
-/**
- *
- * @author sclarke
- *
- */
-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) {
- return AnnotationsManager.getAnnotations(inputElement);
- }
- 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 4a15b45..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.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.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;
-
-/**
- *
- * @author sclarke
- *
- */
-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");
- } else {
- getDefaultLabel().setText("");
- }
- }
-}
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 b454eb4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.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.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;
-
-/**
- *
- * @author sclarke
- *
- */
-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"));
- 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/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 bab814f..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.org
-
-# "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 52acb74..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/feature.xml
+++ /dev/null
@@ -1,79 +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.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"/>
-
-</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_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 3454359..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.org
-
-# "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 f340c5c..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
+++ /dev/null
@@ -1,38 +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"
- 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.cxf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws_sdk.feature"
- 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 2c5dc90..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.org
-
-# "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 4307c8d..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.cxf_tests.feature"
- label="%featureName"
- version="0.3.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>
-
- <plugin
- id="org.eclipse.jst.ws.cfx.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</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.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 39269db..0000000
--- a/features/org.eclipse.jst.ws.jaxws.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 (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse.org
-
-# "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) 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.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
deleted file mode 100644
index d0ce38b..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.feature"
- label="%featureName"
- version="0.5.1.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.0.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"/>
-
-</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_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 c9b54b1..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.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 SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse.org
-
-# "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) 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_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
deleted file mode 100644
index adfe622..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws_sdk.feature"
- label="%featureName"
- version="0.5.1.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>
-
- <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 2d33286..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.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 Tests (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse.org
-
-# "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) 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_tests.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml
deleted file mode 100644
index 9b95003..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws_tests.feature"
- label="%featureName"
- version="0.5.1.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"/>
-
-</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/tests/org.eclipse.jst.ws.cxf.tests/.classpath b/tests/org.eclipse.jst.ws.cxf.tests/.classpath
deleted file mode 100644
index 2fbb7a2..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.4"/>
- <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 20439ae..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.cfx.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/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.cxf.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5552f02..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Jan 10 09:20:54 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
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 83f6d75..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.ws.cfx.tests
-Bundle-Version: 0.3.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core.tests;bundle-version="0.5.0"
-Export-Package: org.eclipse.jst.ws.cfx.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 7f9503f..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.cfx.tests
-Bundle-Name.0 = Tests Plug-in
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/AllTestsSuite.java b/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/AllTestsSuite.java
deleted file mode 100644
index 3fb40f9..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,38 +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.cfx.tests;
-
-import junit.framework.TestSuite;
-
-
-/**
- * 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 AllTestsSuite() {
- super("All JAXWS Test Suites");
- addTest(org.eclipse.jst.ws.jaxws.core.tests.JAXWSCoreTestSuite.suite());
- //addTestSuite(EasyTest.class);
- }
-
- /**
- * 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/cfx/tests/EasyTest.java b/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/EasyTest.java
deleted file mode 100644
index 9e4c702..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/EasyTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.jst.ws.cfx.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 3ebc5ac..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.cfx.tests"/>
- <property
- name="classname"
- value="org.eclipse.jst.ws.cfx.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.jaxws.core.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath
deleted file mode 100644
index 64c5e31..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.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.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 362ec5e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Mar 02 16:38:41 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/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 dade09d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +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,4.0.0)",
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.jdt.launching,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0"
-Import-Package: javax.jws,
- javax.xml.ws
-Export-Package: 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 f9ff070..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/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
-###############################################################################
-
-#properties file for JAX-WS Tools Tests
-pluginName=JAX-WS Tools Tests (Incubation)
-providerName=Eclipse.org
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 5bd4c3f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java
+++ /dev/null
@@ -1,81 +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.resources.IFile;
-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.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.ltk.ui.refactoring.RefactoringUI;
-/**
- *
- * @author sclarke
- *
- */
-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");
-
- source = testJavaProject.createCompilationUnit(getPackageName(), getClassName(), getClassContents());
-
- compilationUnit = AnnotationUtils.getASTParser(source);
- ast = compilationUnit.getAST();
- rewriter = ASTRewrite.create(ast);
- annotation = getAnnotation();
- textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source
- .getResource());
- }
-
- public abstract String getPackageName();
- public abstract String getClassName();
- public abstract String getClassContents();
- public abstract Annotation getAnnotation();
-
- protected boolean executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return false;
- }
-
- change.initializeValidationData(monitor);
-
- PerformChangeOperation changeOperation = RefactoringUI.createUIAwareChangeOperation(change);
- try {
- changeOperation.run(monitor);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- return changeOperation.changeExecuted();
- }
-
- @Override
- protected void tearDown() throws Exception {
- testJavaProject.getProject().delete(true, true, null);
- }
-}
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 9b86eaa..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 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;
-
-/**
- *
- * @author sclarke
- *
- */
-public class AddAnnotationToFieldTest extends AbstractAnnotationTest {
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "CalculatorClient.java";
- }
-
- @Override
- public String getClassContents() {
- return "public class CalculatorClient {\n\nstatic CalculatorService service;\n\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- MemberValuePair wsdlLocationValuePair = AnnotationsCore.createStringMemberValuePair(ast, "wsdlLocation",
- "http://localhost:8083/Calculator/servives/CalculatorService?WSDL");
- memberValuePairs.add(wsdlLocationValuePair);
-
- return AnnotationsCore.createAnnotation(ast, javax.xml.ws.WebServiceRef.class,
- javax.xml.ws.WebServiceRef.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToField() {
- try {
- assertNotNull(annotation);
- assertEquals("WebServiceRef", AnnotationUtils.getAnnotationName(annotation));
-
- IField field = source.findPrimaryType().getField("service");
- assertNotNull(field);
-
- AnnotationUtils.createFiedlAnnotationChange(source, compilationUnit, rewriter, field, annotation,
- textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(field,
- AnnotationUtils.getAnnotationName(annotation)));
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
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 a2c0b44..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java
+++ /dev/null
@@ -1,81 +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 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.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- *
- * @author sclarke
- *
- */
-public class AddAnnotationToMethodParameterTest extends AbstractAnnotationTest {
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- return "public class Calculator {\n\n\tpublic int add(int i, int k) {" +
- "\n\t\treturn i + k;\n\t}\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "i");
- memberValuePairs.add(nameValuePair);
- return AnnotationsCore.createAnnotation(ast, javax.jws.WebParam.class,
- javax.jws.WebParam.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToMethodParameter() {
- try {
- assertNotNull(annotation);
- assertEquals("WebParam", AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] {"I", "I"});
- assertNotNull(method);
-
- SingleVariableDeclaration parameter = AnnotationUtils.getMethodParameter(compilationUnit, method,
- 44);
-
- AnnotationUtils.createMethodParameterAnnotationChange(source, compilationUnit, rewriter,
- parameter, method, annotation, textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- //refresh
- parameter = AnnotationUtils.getMethodParameter(
- AnnotationUtils.getASTParser(method.getCompilationUnit()), method, 44);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(parameter, annotation));
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
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 a6d01c1..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.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 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;
-
-/**
- *
- * @author sclarke
- *
- */
-public class AddAnnotationToMethodTest extends AbstractAnnotationTest {
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- return "public class Calculator {\n\n\tpublic int add(int i, int k) {" +
- "\n\t\treturn i + k;\n\t}\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast, "operationName",
- "add");
- memberValuePairs.add(operationValuePair);
- return AnnotationsCore.createAnnotation(ast, javax.jws.WebMethod.class,
- javax.jws.WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToMethod() {
- try {
- assertNotNull(annotation);
- assertEquals("WebMethod", AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] {"I", "I"});
- assertNotNull(method);
-
- AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
- annotation, textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method,
- AnnotationUtils.getAnnotationName(annotation)));
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
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 ba3240e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java
+++ /dev/null
@@ -1,87 +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 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;
-
-/**
- *
- * @author sclarke
- *
- */
-public class AddAnnotationToTypeTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- return "public class Calculator {\n\n\tpublic int add(int i, int k) {" +
- "\n\t\treturn i + k;\n\t}\n}";
- }
-
- @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.createAnnotation(ast, javax.jws.WebService.class,
- javax.jws.WebService.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToType() {
- try {
- assertNotNull(annotation);
- assertEquals("WebService", AnnotationUtils.getAnnotationName(annotation));
-
- AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, annotation,
- textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source,
- AnnotationUtils.getAnnotationName(annotation)));
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
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 ff0a0b5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.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.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);
- }
-
-}
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 c5aafba..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.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 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;
-
-/**
- *
- * @author sclarke
- *
- */
-public class RemoveAnnotationFromFieldTest extends AbstractAnnotationTest {
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "CalculatorClient.java";
- }
-
- @Override
- public String getClassContents() {
- return "public class CalculatorClient {\n\n@WebServiceRef()\nstatic CalculatorService service;\n\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createAnnotation(ast, javax.xml.ws.WebServiceRef.class,
- javax.xml.ws.WebServiceRef.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromField() {
- try {
- assertNotNull(annotation);
- assertEquals("WebServiceRef", AnnotationUtils.getAnnotationName(annotation));
-
- IField field = source.findPrimaryType().getField("service");
- assertNotNull(field);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(field,
- AnnotationUtils.getAnnotationName(annotation)));
-
- AnnotationUtils.removeAnnotationFromField(source, compilationUnit, rewriter, field, annotation,
- textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(field,
- AnnotationUtils.getAnnotationName(annotation)));
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
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 22885ad..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java
+++ /dev/null
@@ -1,76 +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.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.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- *
- * @author sclarke
- *
- */
-public class RemoveAnnotationFromMethodParameterTest extends AbstractAnnotationTest {
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- return "public class Calculator {\n\n\tpublic int add(@WebParam(name=\"i\")int i, int k) {" +
- "\n\t\treturn i + k;\n\t}\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createAnnotation(ast, javax.jws.WebParam.class,
- javax.jws.WebParam.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromMethodParameter() {
- try {
- assertNotNull(annotation);
- assertEquals("WebParam", AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] {"I", "I"});
- assertNotNull(method);
-
- SingleVariableDeclaration parameter = AnnotationUtils.getMethodParameter(compilationUnit, method,
- 44);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(parameter, annotation));
-
- AnnotationUtils.removeAnnotationFromMethodParameter(source, rewriter, parameter, annotation,
- textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- //refresh
- parameter = AnnotationUtils.getMethodParameter(
- AnnotationUtils.getASTParser(method.getCompilationUnit()), method, 44);
-
- assertFalse(AnnotationUtils.isAnnotationPresent(parameter, annotation));
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
\ 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 c6542c6..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.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 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;
-
-/**
- *
- * @author sclarke
- *
- */
-public class RemoveAnnotationFromMethodTest extends AbstractAnnotationTest {
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- return "public class Calculator {\n\n\t@WebMethod\npublic int add(int i, int k) {" +
- "\n\t\treturn i + k;\n\t}\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createAnnotation(ast, javax.jws.WebMethod.class,
- javax.jws.WebMethod.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromMethod() {
- try {
- assertNotNull(annotation);
- assertEquals("WebMethod", AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] {"I", "I"});
- assertNotNull(method);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method,
- AnnotationUtils.getAnnotationName(annotation)));
-
- AnnotationUtils.removeAnnotationFromMethod(source, compilationUnit, rewriter, method, annotation,
- textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(method,
- AnnotationUtils.getAnnotationName(annotation)));
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
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 9032aca..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java
+++ /dev/null
@@ -1,66 +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.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;
-
-/**
- *
- * @author sclarke
- *
- */
-public class RemoveAnnotationFromTypeTest extends AbstractAnnotationTest {
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- return "@WebService()\npublic class Calculator {\n\n\tpublic int add(int i, int k) {" +
- "\n\t\treturn i + k;\n\t}\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createAnnotation(ast, javax.jws.WebService.class,
- javax.jws.WebService.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromType() {
- try {
- assertNotNull(annotation);
- assertEquals("WebService", AnnotationUtils.getAnnotationName(annotation));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source,
- AnnotationUtils.getAnnotationName(annotation)));
-
- AnnotationUtils.removeAnnotationFromType(source, compilationUnit, rewriter, annotation,
- textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-}
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 4f8a28d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.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 org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-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.JavaRuntime;
-
-/**
- *
- * @author sclarke
- *
- */
-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, JavaRuntime.getDefaultJREContainerEntry());
- createOutputFolder();
- }
-
- 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 cca05d2..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.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 org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceDescription;
-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;
-
-/**
- *
- * @author sclarke
- *
- */
-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);
-
- IWorkspaceDescription description = ResourcesPlugin.getWorkspace().getDescription();
- description.setAutoBuilding(false);
- ResourcesPlugin.getWorkspace().setDescription(description);
-
- }
-
- 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) throws CoreException {
- if (!folder.exists()) {
- if (folder.getParent() instanceof IFolder) {
- mkdirs((IFolder) folder.getParent());
- }
- folder.create(true, true, null);
- }
- }
-}
