This commit was manufactured by cvs2svn to create tag 'v200904182210'.
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.cxf.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
deleted file mode 100644
index f8721ed..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.consumption.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fc358c6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:53 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 2c57a94..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.ui;singleton:=true
-Bundle-Version: 0.3.3.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.core.resources,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jdt.ui,
- org.eclipse.wst.ws,
- org.eclipse.jst.ws.cxf.consumption.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.command.env,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.jst.ws.cxf.ui,
- javax.wsdl,
- 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.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- .,\
- plugin.properties,\
- plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
deleted file mode 100644
index ea18e21..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption UI (Incubation)
-pluginProvider=Eclipse.org
-
-JAXWS_WEBSERVICETYPE=POJO Web Service
-
-JAXWS_CLIENT=JAX-WS Stub
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
deleted file mode 100644
index 3c0d1b6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.cxf.wsImpl.java"
- label="%JAXWS_WEBSERVICETYPE"
- resourceTypeMetadata="File IResource CompilationUnit"
- extensionMetadata=".java .class"
- objectSelectionWidget="org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
- mergerClass="org.eclipse.jst.ws.internal.consumption.common.JavaMerger">
- </webServiceImpl>
- </extension>
-
- <!--<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
- <webServiceClientImpl
- id="org.eclipse.jst.ws.cxf.client.type.java"
- label="%JAXWS_CLIENT">
- </webServiceClientImpl>
- </extension>-->
-
- <extension point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class=" org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.CXFJAXWSSelectionLaunchable"
- external_modify="true"
- id=" org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object.JAXWSSelectionTransformer">
- </objectSelectionWidget>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- class="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.WSDL2JavaClientConfigWidgetFactory"
- id="WSDL2JavaClientConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand">
- </widgetFactory>
- </extension>
-
- </plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
deleted file mode 100644
index 68eacad..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- *
- * @author sclarke
- *
- */
-public class CXFConsumptionUIMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages"; //$NON-NLS-1$
- public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE;
- public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE;
-
- public static String WSDL2JAVA_CLIENT_PAGE_TITLE;
- public static String WSDL2JAVA_CLIENT_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE;
- public static String WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_GROUP_LABEL;
- public static String WSDL2JAVA_XJC_ARG_GROUP_LABEL;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(CXFConsumptionUIMessages.BUNDLE_NAME, CXFConsumptionUIMessages.class);
- }
-
- private CXFConsumptionUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
deleted file mode 100644
index b9f6c76..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE=Browse Workspace Classes and Interfaces
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE=Select Java Class or Interface which will be used to create the Web Service
-
-#WSDL2Java Client Congih Widget Factory
-WSDL2JAVA_CLIENT_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-#WSDL2Java Client Defaults Config Widget
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options
-WSDL2JAVA_XJC_ARG_GROUP_LABEL=XJC Arguments
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
deleted file mode 100644
index 1e644bc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.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.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- * @author sclarke
- */
-public class CXFConsumptionUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFConsumptionUIPlugin plugin;
-
- /**
- * The constructor
- */
- public CXFConsumptionUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- CXFConsumptionUIPlugin.plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- CXFConsumptionUIPlugin.plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static CXFConsumptionUIPlugin getDefault() {
- return CXFConsumptionUIPlugin.plugin;
- }
-
- public static void logMessage(int severity, String message) {
- CXFConsumptionUIPlugin.log(new Status(severity, CXFConsumptionUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFConsumptionUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFConsumptionUIPlugin.log(new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID,
- exception.getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
deleted file mode 100644
index 1487a1b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.AbstractObjectSelectionLaunchable;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class CXFJAXWSSelectionLaunchable extends AbstractObjectSelectionLaunchable {
- private IStatus validationStatus = Status.OK_STATUS;
-
- private IProject project;
- private String serverComponentName;
- private String className;
-
- @Override
- public void setInitialSelection(IStructuredSelection initialSelection) {
- if (initialSelection != null && !initialSelection.isEmpty()) {
- Object firstElement = initialSelection.getFirstElement();
- className = firstElement.toString();
- }
- }
-
- @Override
- public int launch(Shell shell) {
- IStatus status = Status.OK_STATUS;
- ElementTreeSelectionDialog selectionDialog = new ElementTreeSelectionDialog(shell,
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- selectionDialog.setTitle(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE);
- selectionDialog
- .setMessage(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE);
- selectionDialog.setAllowMultiple(false);
- selectionDialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- selectionDialog.addFilter(new JavaViewerFilter());
-
- selectionDialog.setValidator(new JavaSelectionStatusValidator());
-
- int returnCode = selectionDialog.open();
- if (returnCode == Window.OK) {
- ICompilationUnit selectedCompilationUnit = (ICompilationUnit) selectionDialog.getFirstResult();
- IType type = selectedCompilationUnit.findPrimaryType();
- className = type.getFullyQualifiedName();
- try {
- IResource typeResource = type.getUnderlyingResource();
- if (typeResource != null) {
- this.project = typeResource.getProject();
- IVirtualComponent comp = ResourceUtils.getComponentOf(typeResource);
- if (comp != null) {
- serverComponentName = comp.getName();
- }
- } else {
- project = null;
- serverComponentName = null;
- }
- return status.getSeverity();
- } catch (JavaModelException jme) {
- project = null;
- serverComponentName = null;
- status = jme.getStatus();
- CXFConsumptionUIPlugin.log(status);
- return status.getSeverity();
- }
- }
-
- return IStatus.CANCEL;
- }
-
- @Override
- public IStructuredSelection getObjectSelection() {
- if (className != null) {
- IStructuredSelection objectSelection = new StructuredSelection(className);
- return objectSelection;
- }
- return super.getObjectSelection();
- }
-
- public String getComponentName() {
- return serverComponentName;
- }
-
- public IProject getProject() {
- ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getSelectionService();
- ISelection selection = selectionService.getSelection();
-
- if (selection != null && !selection.isEmpty() && selection instanceof TreeSelection) {
- TreeSelection treeSelection = (TreeSelection) selection;
- Object firstElement = treeSelection.getFirstElement();
- if (firstElement instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) firstElement;
- project = compilationUnit.getResource().getProject();
- }
- }
- return project;
- }
-
- @Override
- public IStatus validateSelection(IStructuredSelection objectSelection) {
- return validationStatus;
- }
-
- @Override
- public String getObjectSelectionDisplayableString() {
- return className;
- }
-
- @Override
- public boolean validate(String stringToValidate) {
- className = stringToValidate;
-
- IProject project = getProject();
- if (project != null) {
- validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
- return validationStatus.isOK();
- }
-
-// IProject project = getProject();
-// if (project != null) {
-// IType type = JDTUtils.getType(project, className);
-// if (type == null || !type.exists()) {
-// validationStatus = new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, "");
-// } else {
-// validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
-// }
-// return validationStatus.isOK();
-// }
- return false;
- }
-
- private static class JavaViewerFilter extends ViewerFilter {
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- try {
- if (element instanceof IJavaProject) {
- return true;
- }
- if (element instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
- return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
- }
- if (element instanceof IPackageFragment) {
- IPackageFragment packageFragment = (IPackageFragment) element;
- return packageFragment.hasChildren();
- }
- if (element instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType type = compilationUnit.findPrimaryType();
- return type.isClass() || type.isInterface();
-
- }
- } catch (JavaModelException jme) {
- CXFConsumptionUIPlugin.log(jme.getStatus());
- }
- return false;
- }
- }
-
- private static class JavaSelectionStatusValidator implements ISelectionStatusValidator {
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- return new Status(IStatus.OK, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
- return new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
deleted file mode 100644
index 5aad658..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameEditingSupport;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameTableContentProvider;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidget extends SimpleWidgetDataContributor {
- private IStatus status = Status.OK_STATUS;
- private Listener statusListener;
-
- private WSDL2JavaDataModel model;
-
- private Composite namespaceCompositeHolder;
- private Composite namespaceComposite;
- private int namespaceCompositeHeight = -1;
-
- public WSDL2JavaClientConfigWidget(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- this.statusListener = statusListener;
-
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(3, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- // Output Dir
- WSDL2JavaWidgetFactory.createOutputDirectoryLabel(mainComposite);
-
- Combo outputDirCombo = WSDL2JavaWidgetFactory.createOutputDirectoryCombo(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- outputDirCombo.setLayoutData(gridData);
-
- // Package Name:
- WSDL2JavaWidgetFactory.createPackageNameLabel(mainComposite);
-
- final Text packageNameText = WSDL2JavaWidgetFactory.createPackageNameText(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- packageNameText.setLayoutData(gridData);
-
- packageNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String packageName = packageNameText.getText();
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName);
- statusListener.handleEvent(null);
- }
- });
-
- final Button namespaceMappingButton = WSDL2JavaWidgetFactory
- .createNamespacePackageMappingButton(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 3;
- namespaceMappingButton.setLayoutData(gridData);
- namespaceMappingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (namespaceMappingButton.getSelection()) {
- if (namespaceComposite == null) {
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 7;
- namespaceCompositeHolder.setLayoutData(gridData);
- namespaceCompositeHolder.pack();
-
- namespaceComposite = getNamespaceMappingComposite(namespaceCompositeHolder);
- if (namespaceCompositeHeight == -1) {
- Point groupSize = namespaceComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
- namespaceCompositeHeight = groupSize.y;
- }
- Shell shell = parent.getShell();
- Point shellSize = shell.getSize();
- shell.setSize(shellSize.x, shellSize.y + namespaceCompositeHeight);
-
- namespaceCompositeHolder.layout();
- }
- } else {
- if (namespaceComposite != null) {
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- namespaceCompositeHolder.setLayoutData(gridData);
- namespaceCompositeHolder.pack();
- namespaceComposite.dispose();
- namespaceComposite = null;
- namespaceCompositeHolder.layout();
- Shell shell = parent.getShell();
- Point shellSize = shell.getSize();
- shell.setSize(shellSize.x, shellSize.y - namespaceCompositeHeight);
- }
- }
- }
- });
-
- namespaceCompositeHolder = new Composite(mainComposite, SWT.NONE);
- gridLayout = new GridLayout(1, true);
- namespaceCompositeHolder.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- namespaceCompositeHolder.setLayoutData(gridData);
-
- // Service Name:
-// WSDL2JavaWidgetFactory.createServiceNameLabel(mainComposite);
-//
-// Combo serviceNameCombo = WSDL2JavaWidgetFactory.createServiceNameCombo(mainComposite, model);
-// gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-// gridData.horizontalSpan = 2;
-// serviceNameCombo.setLayoutData(gridData);
-
- Label bindingFilesLabel = WSDL2JavaWidgetFactory.createBindingFilesLabel(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.verticalSpan = 3;
- bindingFilesLabel.setLayoutData(gridData);
-
- List bindingFilesList = WSDL2JavaWidgetFactory.createBindingFilesList(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.verticalSpan = 3;
- bindingFilesList.setLayoutData(gridData);
-
- Button addBindingFileButton = WSDL2JavaWidgetFactory.createAddBindingFileButton(mainComposite, model,
- bindingFilesList);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- addBindingFileButton.setLayoutData(gridData);
-
- Button removeBindingFileButton = WSDL2JavaWidgetFactory.createRemoveBindingFileButton(mainComposite,
- model, bindingFilesList);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- removeBindingFileButton.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createPaddingLabel(mainComposite);
-
- /*
- WSDL2JavaWidgetFactory.createXMLCatalogLabel(mainComposite);
-
- Text xmlCatalogText = WSDL2JavaWidgetFactory.createXMLCatalogText(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xmlCatalogText.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createXMLCatalogBrowseButton(mainComposite);
- */
- return this;
- }
-
- public Table createNamespaceMappingTable(Composite parent) {
- TableViewer packageNameTableViewer = new TableViewer(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER
- | SWT.FULL_SELECTION);
-
- final Table packageNameTable = packageNameTableViewer.getTable();
- packageNameTable.setLinesVisible(true);
- packageNameTable.setHeaderVisible(true);
-
- TableLayout tableLayout = new TableLayout();
- packageNameTable.setLayout(tableLayout);
-
- WSDL2JavaWidgetFactory.createWSDLNamespaceViewerColumn(packageNameTableViewer);
-
- ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- TableViewerColumn packageNameViewerColumn = WSDL2JavaWidgetFactory.createPackageNameColumn(
- packageNameTableViewer, model);
-
- packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
- new PackageNameTextCellEditor(packageNameTableViewer.getTable()), model));
-
- columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- packageNameTableViewer.setContentProvider(new PackageNameTableContentProvider());
- packageNameTableViewer.setInput(model.getWsdlDefinition());
-
- TableItem[] tableItems = packageNameTableViewer.getTable().getItems();
- for (int i = 0; i < tableItems.length; i++) {
- TableItem tableItem = tableItems[i];
- if (model.getIncludedNamespaces().containsKey(tableItem.getText(0))) {
- tableItem.setChecked(true);
- }
- }
- return packageNameTable;
- }
-
- private Composite getNamespaceMappingComposite(Composite parent) {
- namespaceComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, true);
- namespaceComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- namespaceComposite.setLayoutData(gridData);
-
- Table packageNameTable = createNamespaceMappingTable(namespaceComposite);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- packageNameTable.setLayoutData(gridData);
-
- return namespaceComposite;
- }
-
- @Override
- public IStatus getStatus() {
- return status;
- }
-
- private class PackageNameTextCellEditor extends TextCellEditor implements ICellEditorListener,
- ICellEditorValidator {
-
- public PackageNameTextCellEditor(Composite parent) {
- super(parent);
- addListener(this);
- setValidator(this);
- }
-
- public void applyEditorValue() {
- }
-
- public void cancelEditor() {
- }
-
- public void editorValueChanged(boolean oldValidState, boolean newValidState) {
- statusListener.handleEvent(null);
- }
-
- public String isValid(Object packageName) {
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
- if (status.getSeverity() == IStatus.OK) {
- return null;
- }
- return status.getMessage();
- }
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
deleted file mode 100644
index 4b0ceba..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidgetFactory implements INamedWidgetContributorFactory {
- private SimpleWidgetContributor wsdl2JavaClientWidgetContributor;
- private SimpleWidgetContributor wsdl2JavaClientDefaultsWidgetContributor;
-
- private WSDL2JavaDataModel model;
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if ((model != null) && (wsdl2JavaClientWidgetContributor == null
- || wsdl2JavaClientDefaultsWidgetContributor == null)) {
- init();
- }
- return wsdl2JavaClientWidgetContributor;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- if (widgetContributor == wsdl2JavaClientWidgetContributor) {
- return wsdl2JavaClientDefaultsWidgetContributor;
- }
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(WSDL2JavaClientDefaultingCommand.class,
- "WSDL2JavaDataModel", WSDL2JavaClientConfigWidgetFactory.class); //$NON-NLS-1$
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- if ((model != null) && (wsdl2JavaClientWidgetContributor == null
- || wsdl2JavaClientDefaultsWidgetContributor == null)) {
- init();
- }
- }
-
- private void init() {
- final WSDL2JavaClientConfigWidget wsdl2JavaConfigWidget = new WSDL2JavaClientConfigWidget(model);
- wsdl2JavaClientWidgetContributor = new SimpleWidgetContributor();
- CXFContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- String wsdl2JavaClientPageTitle = CXFConsumptionUIMessages.bind(
- CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_TITLE, new Object[]{
- context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
- wsdl2JavaClientWidgetContributor.setTitle(wsdl2JavaClientPageTitle);
- wsdl2JavaClientWidgetContributor
- .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_DESCRIPTION);
- wsdl2JavaClientWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaConfigWidget;
- }
- });
-
- final WSDL2JavaClientDefaultsConfigWidget wsdl2JavaClientDefaultsConfigWidget =
- new WSDL2JavaClientDefaultsConfigWidget(model);
- wsdl2JavaClientDefaultsWidgetContributor = new SimpleWidgetContributor();
- String wsdl2JavaClientDefaultsPageTitle = CXFConsumptionUIMessages.bind(
- CXFConsumptionUIMessages.WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE, new Object[] {
- context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
- wsdl2JavaClientDefaultsWidgetContributor.setTitle(wsdl2JavaClientDefaultsPageTitle);
- wsdl2JavaClientDefaultsWidgetContributor
- .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION);
- wsdl2JavaClientDefaultsWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaClientDefaultsConfigWidget;
- }
- });
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
deleted file mode 100644
index d0c7628..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- *
- * @author sclarke
- *
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientDefaultsConfigWidget extends SimpleWidgetDataContributor {
-
- private WSDL2JavaDataModel model;
-
- public WSDL2JavaClientDefaultsConfigWidget(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(mainComposite, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(1, true);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
-// WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, model);
- WSDL2JavaWidgetFactory.createGenerateImplementationButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(wsdl2javaGroup, model);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, model);
- }
-
- if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, model);
- }
-
- Group xjcArgGroup = new Group(mainComposite, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_XJC_ARG_GROUP_LABEL);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- Table xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable, model);
- return this;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
deleted file mode 100644
index ed0458f..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class JAXWSSelectionTransformer implements Transformer {
-
- public Object transform(Object value) {
- if (value instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection) value;
- Object selection = structuredSelection.getFirstElement();
- if (selection instanceof IFile) {
- IFile file = (IFile) selection;
- String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
- return new StructuredSelection(fullyQualifiedJavaName);
- } else if (selection instanceof ICompilationUnit) {
- IResource resource = ((ICompilationUnit) selection).getResource();
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
- return new StructuredSelection(fullyQualifiedJavaName);
- }
- }
- if (selection instanceof String) {
- return structuredSelection;
- }
- }
- return StructuredSelection.EMPTY;
- }
-
- private String getFullyQualifiedJavaName(IFile resource) {
- IProject project = resource.getProject();
-
- IPath path = resource.getFullPath();
-
- if (path.getFileExtension() != null) {
- path = path.removeFileExtension();
- }
-
- String javaFileName = path.lastSegment();
-
- if (path.isAbsolute()) {
- try {
- IPath javaFolderPath = path.removeLastSegments(1);
- IPackageFragment packageFragment = JDTUtils.getJavaProject(project).findPackageFragment(
- javaFolderPath);
- return packageFragment.getElementName() + "." + javaFileName; //$NON-NLS-1$
- } catch (JavaModelException jme) {
- CXFConsumptionUIPlugin.log(jme.getStatus());
- }
- }
- return javaFileName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
deleted file mode 100644
index 876eca5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class CXFWebServiceClient extends AbstractWebServiceClient {
-
- public CXFWebServiceClient(WebServiceClientInfo info) {
- super(info);
- }
-
- @Override
- public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String projectName,
- String earProject) {
-
- Vector commands = new Vector();
-
- WSDL2JavaDataModel wsdl2JavaModel = CXFFactory.eINSTANCE.createWSDL2JavaDataModel();
- commands.add(new WSDL2JavaClientDefaultingCommand(wsdl2JavaModel, projectName,
- getWebServiceClientInfo().getWsdlURL()));
- commands.add(new WSDL2JavaClientCommand(wsdl2JavaModel));
-
- return new SimpleCommandFactory(commands);
- }
-
- @Override
- public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.creation.core/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.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.creation.core/.project b/bundles/org.eclipse.jst.ws.cxf.creation.core/.project
deleted file mode 100644
index 12dd1e0..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.creation.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.creation.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.creation.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3c4e8e2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:54 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.creation.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 9080a5c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.creation.core
-Bundle-Version: 0.3.5.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.creation.core.commands
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.ws,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.jdt.ui,
- javax.wsdl,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.wst.server.core,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.text,
- org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.emf.ecore,
- org.eclipse.jem
-Bundle-ActivationPolicy: lazy
-Ant-Version: Apache Ant 1.7.0
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/about.html b/bundles/org.eclipse.jst.ws.cxf.creation.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.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.creation.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/build.properties
deleted file mode 100644
index 5b6a736..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- .,\
- plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties
deleted file mode 100644
index 346d71d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Creation Core (Incubation)
-pluginProvider=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java
deleted file mode 100644
index ac7be37..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java
+++ /dev/null
@@ -1,33 +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.creation.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- *
- * @author sclarke
- *
- */
-public class CXFCreationCoreMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages"; //$NON-NLS-1$
- public static String WSDL2JAVA_PROJECT_SELECTION_ERROR;
- public static String WSDL2JAVA_VALID_PORTTYPE_MESSAGE;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, CXFCreationCoreMessages.class);
- }
-
- private CXFCreationCoreMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
deleted file mode 100644
index b025aac..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-WSDL2JAVA_PROJECT_SELECTION_ERROR=Project configuration Error. Please select the "Service project:{0}" link in the "Configuration:" section and change the Service Project setting from {0} to {1}.
-WSDL2JAVA_VALID_PORTTYPE_MESSAGE=The WSDL document must have a valid portType element
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java
deleted file mode 100644
index 8791927..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java
+++ /dev/null
@@ -1,78 +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.creation.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 CXFCreationCorePlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.creation.core"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFCreationCorePlugin plugin;
-
- /**
- * The constructor
- */
- public CXFCreationCorePlugin() {
- }
-
- /*
- * (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 CXFCreationCorePlugin getDefault() {
- return plugin;
- }
-
- public static void logMessage(int severity, String message) {
- CXFCreationCorePlugin.log(new Status(severity, CXFCreationCorePlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFCreationCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFCreationCorePlugin.log(new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID,
- exception.getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java
deleted file mode 100644
index 95aefe6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java
+++ /dev/null
@@ -1,164 +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.creation.core.commands;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-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.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.WSDLUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- *
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class CXFDeployCommand extends AbstractDataModelOperation {
- private static final String CXF_SERVLET = "org.apache.cxf.transport.servlet.CXFServlet"; //$NON-NLS-1$
- private IProject project;
- private IWebService webService;
- private CXFDataModel model;
-
- public CXFDeployCommand(String projectName, IWebService webService) {
- this.project = FileUtils.getProject(projectName);
- this.webService = webService;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
-
- try {
- WebServiceInfo webServiceInfo = webService.getWebServiceInfo();
-
- String serverInstanceId = webServiceInfo.getServerInstanceId();
- String serverFactoryId = webServiceInfo.getServerFactoryId();
- if (serverInstanceId != null) {
- IServer server = ServerCore.findServer(serverInstanceId);
- String webCobComponentURL = ServerUtils.getEncodedWebComponentURL(project, serverFactoryId,
- server);
-
- String urlPattern = ""; //$NON-NLS-1$
-
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object modelProvider = provider.getModelObject();
- // jst.web 2.5
- if (modelProvider instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp javaeeWebApp =
- (org.eclipse.jst.javaee.web.WebApp) modelProvider;
-
- urlPattern = getURLPattern(javaeeWebApp);
- }
-
- // jst.web 2.4
- if (modelProvider instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp =
- (org.eclipse.jst.j2ee.webapplication.WebApp) modelProvider;
-
- urlPattern = getURLPattern(webApp);
- }
-
- urlPattern = urlPattern.substring(0, urlPattern.lastIndexOf("/")); //$NON-NLS-1$
- String jaxwsEndpointAddress = SpringUtils.getEndpointAddress(project,
- model.getConfigId());
-
- String wsdlAddress = webCobComponentURL + urlPattern + jaxwsEndpointAddress;
- String wsdlURL = wsdlAddress + "?wsdl"; //$NON-NLS-1$
-
- webService.getWebServiceInfo().setWsdlURL(wsdlURL);
-
- Definition definition = model.getWsdlDefinition();
- SOAPAddress soapAddress = WSDLUtils.getEndpointAddress(definition);
- if (soapAddress != null) {
- soapAddress.setLocationURI(wsdlAddress);
- WSDLUtils.writeWSDL(model);
- }
- }
- } catch (IOException ioe) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFCreationCorePlugin.log(status);
- }
-
- return status;
- }
-
- @SuppressWarnings("unchecked")
- private String getURLPattern(org.eclipse.jst.javaee.web.WebApp javaeeWebApp) {
- List<org.eclipse.jst.javaee.web.Servlet> servlets = javaeeWebApp.getServlets();
- for (org.eclipse.jst.javaee.web.Servlet servlet : servlets) {
- if (servlet.getServletClass().equals(CXF_SERVLET)) {
- List<org.eclipse.jst.javaee.web.ServletMapping> servletMappings =
- javaeeWebApp.getServletMappings();
- for (org.eclipse.jst.javaee.web.ServletMapping servletMapping : servletMappings) {
- if (servletMapping.getServletName().equals(servlet.getServletName())) {
- List<org.eclipse.jst.javaee.core.UrlPatternType> urlPatterns =
- servletMapping.getUrlPatterns();
- if (urlPatterns.size() > 0) {
- String value = ((org.eclipse.jst.javaee.core.UrlPatternType)
- urlPatterns.get(0)).getValue();
- return value;
- }
- }
- }
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- @SuppressWarnings("unchecked")
- private String getURLPattern(org.eclipse.jst.j2ee.webapplication.WebApp webApp) {
- List<org.eclipse.jst.j2ee.webapplication.Servlet> servlets = webApp.getServlets();
- for (org.eclipse.jst.j2ee.webapplication.Servlet servlet : servlets) {
- if (servlet.getServletClass().getJavaName().equals(CXF_SERVLET)) {
- List<org.eclipse.jst.j2ee.webapplication.ServletMapping> servletMappings =
- webApp.getServletMappings();
- for (org.eclipse.jst.j2ee.webapplication.ServletMapping servletMapping : servletMappings) {
- if (servletMapping.getServlet().getServletName().equals(servlet.getServletName())) {
- return servletMapping.getUrlPattern();
- }
- }
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- public void setCXFDataModel(CXFDataModel model) {
- this.model = model;
- }
-
- public String getClientComponentType() {
- return "template.cxf.core"; //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java
deleted file mode 100644
index dec3ffe..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-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.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-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.ui.refactoring.RefactoringUI;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class JAXWSAnnotateJavaCommand extends AbstractDataModelOperation {
-
- private Stack<Change> interfaceUndoChanges = new Stack<Change>();
- private Stack<Change> classUndoChanges = new Stack<Change>();
-
- private Java2WSDataModel model;
- private IType javaClassType;
- private IType javaInterfaceType;
-
- public JAXWSAnnotateJavaCommand(Java2WSDataModel model) {
- this.model = model;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- try {
- if (model.isUseServiceEndpointInterface()) {
- annotateInterface(monitor);
-
- if (model.getFullyQualifiedJavaClassName() != null) {
- annotateSEIClass(monitor);
- }
- } else if (model.getFullyQualifiedJavaClassName() != null) {
- annotateClass(monitor);
- }
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFCreationCorePlugin.log(status);
- } catch (InvocationTargetException ite) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ite.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- } catch (InterruptedException ie) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ie.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- }
- return status;
- }
-
- private void annotateInterface(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
- InterruptedException {
- javaInterfaceType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
- .getFullyQualifiedJavaInterfaceName());
-
- TextFileChange textFileChange = new TextFileChange("Annotating Interface",
- (IFile)javaInterfaceType.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
-
- CXFModelUtils.getWebServiceAnnotationChange(javaInterfaceType, model, textFileChange);
-
- IMethod[] typeMethods = JDTUtils.getPublicMethods(javaInterfaceType);
- for (int i = 0; i < typeMethods.length; i++) {
- IMethod method = typeMethods[i];
- Map<String, Boolean> methodAnnotationMap = model.getMethodMap().get(method);
- if (methodAnnotationMap.get(CXFModelUtils.WEB_METHOD)) {
- CXFModelUtils.getWebMethodAnnotationChange(javaInterfaceType, method,
- textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.REQUEST_WRAPPER)) {
- CXFModelUtils.getRequestWrapperAnnotationChange(javaInterfaceType, method,
- textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.RESPONSE_WRAPPER)) {
- CXFModelUtils.getResponseWrapperAnnotationChange(javaInterfaceType, method,
- textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.WEB_PARAM)) {
- List<SingleVariableDeclaration> parameters = AnnotationUtils.getMethodParameters(
- javaInterfaceType, method);
- for (SingleVariableDeclaration parameter : parameters) {
- CXFModelUtils.getWebParamAnnotationChange(javaInterfaceType, method, parameter,
- textFileChange);
- }
- }
- }
-
- CXFModelUtils.getImportsChange(javaInterfaceType.getCompilationUnit(), model,
- textFileChange, false);
-
- executeChange(monitor, textFileChange, interfaceUndoChanges);
- }
-
- private void annotateClass(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
- InterruptedException {
- javaClassType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
- .getFullyQualifiedJavaClassName());
-
- TextFileChange textFileChange = new TextFileChange("Annotating Class",
- (IFile)javaClassType.getCompilationUnit().getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
-
- CXFModelUtils.getWebServiceAnnotationChange(javaClassType, model, textFileChange);
-
- IMethod[] typeMethods = JDTUtils.getPublicMethods(javaClassType);
- for (int i = 0; i < typeMethods.length; i++) {
- IMethod method = typeMethods[i];
- Map<String, Boolean> methodAnnotationMap = model.getMethodMap().get(method);
- if (methodAnnotationMap.get(CXFModelUtils.WEB_METHOD)) {
- CXFModelUtils.getWebMethodAnnotationChange(javaClassType, method, textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.REQUEST_WRAPPER)) {
- CXFModelUtils.getRequestWrapperAnnotationChange(javaClassType, method,
- textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.RESPONSE_WRAPPER)) {
- CXFModelUtils.getResponseWrapperAnnotationChange(javaClassType, method,
- textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.WEB_PARAM)) {
- List<SingleVariableDeclaration> parameters = AnnotationUtils.getMethodParameters(
- javaClassType, method);
- for (SingleVariableDeclaration parameter : parameters) {
- CXFModelUtils.getWebParamAnnotationChange(javaClassType, method, parameter,
- textFileChange);
- }
- }
- }
-
- CXFModelUtils.getImportsChange(javaClassType.getCompilationUnit(), model,
- textFileChange, false);
-
- executeChange(monitor, textFileChange, classUndoChanges);
- }
-
- private void annotateSEIClass(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
- InterruptedException {
- javaClassType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
- .getFullyQualifiedJavaClassName());
-
- TextFileChange textFileChange = new TextFileChange("Annotation Changes",
- (IFile)javaClassType.getCompilationUnit().getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
-
- CXFModelUtils.getWebServiceAnnotationChange(javaClassType, model, textFileChange);
-
- CXFModelUtils.getImportsChange(javaClassType.getCompilationUnit(), model,
- textFileChange, true);
-
- executeChange(monitor, textFileChange, classUndoChanges);
- }
-
- private void executeChange(IProgressMonitor monitor, Change change, Stack<Change> undoChanges)
- throws InvocationTargetException, InterruptedException {
-
- if (change == null) {
- return;
- }
-
- change.initializeValidationData(monitor);
-
- PerformChangeOperation changeOperation = RefactoringUI
- .createUIAwareChangeOperation(change);
-
- WorkbenchRunnableAdapter adapter = new WorkbenchRunnableAdapter(changeOperation);
- PlatformUI.getWorkbench().getProgressService().runInUI(new BusyIndicatorRunnableContext(), adapter,
- adapter.getSchedulingRule());
-
- if (undoChanges != null && changeOperation.changeExecuted()) {
- undoChanges.push(changeOperation.getUndoChange());
- }
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- try {
- if (javaInterfaceType != null) {
- while (!interfaceUndoChanges.isEmpty()) {
- Change undoChange = interfaceUndoChanges.pop();
- if (undoChange != null) {
- executeChange(monitor, undoChange, null);
- }
- }
- }
- if (javaClassType != null) {
- while (!classUndoChanges.isEmpty()) {
- Change undoChange = classUndoChanges.pop();
- if (undoChange != null) {
- executeChange(monitor, undoChange, null);
- }
- }
- }
- } catch (InvocationTargetException ite) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ite.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- } catch (InterruptedException ie) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ie.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- }
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java
deleted file mode 100644
index 600e615..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java
+++ /dev/null
@@ -1,145 +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.creation.core.commands;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-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.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.resources.WebContentChangeListener;
-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.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.WSDLUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Provides a wrapper around the <code>org.apache.cxf.tools.java2ws.JavaToWS</code> or the
- * <code>org.apache.cxf.tools.java2wsdl.JavaToWSDL</code> command depending on the version
- * of CXF used.
- *
- * @author sclarke
- */
-public class Java2WSCommand extends AbstractDataModelOperation {
- private static String JAVA2WSDL_TOOL_CLASS_NAME = "org.apache.cxf.tools.java2wsdl.JavaToWSDL"; //$NON-NLS-1$
- private static String JAVA2WS_TOOL_CLASS_NAME = "org.apache.cxf.tools.java2ws.JavaToWS"; //$NON-NLS-1$
- private String CXF_TOOL_CLASS_NAME;
-
- private Java2WSDataModel model;
- private String projectName;
-
- private JavaResourceChangeListener javaResourceChangeListener;
- private WebContentChangeListener webContentChangeListener;
-
- public Java2WSCommand(Java2WSDataModel model) {
- this.model = model;
- projectName = model.getProjectName();
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- javaResourceChangeListener = new JavaResourceChangeListener(JDTUtils
- .getJavaProjectSourceDirectoryPath(projectName, model.getJavaStartingPoint()));
- webContentChangeListener = new WebContentChangeListener(projectName);
-
- ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
- IResourceChangeEvent.POST_CHANGE);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener,
- IResourceChangeEvent.POST_CHANGE);
-
- if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- CXF_TOOL_CLASS_NAME = JAVA2WS_TOOL_CLASS_NAME;
- } else {
- CXF_TOOL_CLASS_NAME = JAVA2WSDL_TOOL_CLASS_NAME;
- }
-
- String[] progArgs = CommandLineUtils.getJava2WSProgramArguments(model);
-
- try {
- IProject project = FileUtils.getProject(projectName);
- IJavaProject javaProject = JDTUtils.getJavaProject(project);
- LaunchUtils.launch(javaProject, CXF_TOOL_CLASS_NAME, progArgs);
- FileUtils.copyJ2WFilesFromTmp(model);
-
- if (model.isGenerateWSDL()) {
- WSDLUtils.loadSpringConfigInformationFromWSDL((model));
- }
-
- if (model.getFullyQualifiedJavaClassName() != null &&
- model.getFullyQualifiedJavaClassName().trim().length() > 0) {
- SpringUtils.createJAXWSEndpoint(model);
- }
-
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFCreationCorePlugin.log(status);
- } catch (IOException ioe) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- } finally {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
- FileUtils.refreshProject(projectName, monitor);
- }
-
- 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());
- changedResources.addAll(webContentChangeListener.getChangedResources());
- if (changedResources.size() > 0) {
- for (IResource resource : changedResources) {
- try {
- resource.delete(true, monitor);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFCreationCorePlugin.log(status);
- }
- }
- }
- Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
- model.setGenerateClient(context.isGenerateClient());
- model.setGenerateServer(context.isGenerateServer());
- model.setGenerateWrapperFaultBeans(context.isGenerateWrapperFaultBeans());
- model.setGenerateWSDL(context.isGenerateWSDL());
- model.setSoap12Binding(context.isSoap12Binding());
- model.setGenerateXSDImports(context.isGenerateXSDImports());
- return status;
- }
-
- public CXFDataModel getCXFDataModel() {
- return model;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java
deleted file mode 100644
index cede1fe..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java
+++ /dev/null
@@ -1,104 +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.creation.core.commands;
-
-import java.util.Locale;
-
-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.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author sclarke
- */
-public class Java2WSDefaultingCommand extends AbstractDataModelOperation {
- private Java2WSDataModel model;
-
- public Java2WSDefaultingCommand(Java2WSDataModel model) {
- this.model = model;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- try {
- Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
- model.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
- model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
-
- IType startingPointType = getJavaStartingPointType();
- model.setUseServiceEndpointInterface(startingPointType.isInterface());
- model.setExtractInterface(false);
-
- String packageName = startingPointType.getPackageFragment().getElementName();
- model.setTargetNamespace(JDTUtils.getTargetNamespaceFromPackageName(packageName));
-
- model.setAnnotationProcessingEnabled(context.isAnnotationProcessingEnabled());
- model.setGenerateWebMethodAnnotation(context.isGenerateWebMethodAnnotation());
- model.setGenerateWebParamAnnotation(context.isGenerateWebParamAnnotation());
- model.setGenerateRequestWrapperAnnotation(context.isGenerateRequestWrapperAnnotation());
- model.setGenerateResponseWrapperAnnotation(context.isGenerateResponseWrapperAnnotation());
- model.setAnnotationMap(CXFModelUtils.getAnnotationMap(model));
- model.setMethodMap(CXFModelUtils.getMethodMap(startingPointType, model));
-
- model.setGenerateXSDImports(context.isGenerateXSDImports());
- model.setDatabinding(context.getDatabinding());
- model.setFrontend(context.getFrontend());
- model.setGenerateClient(context.isGenerateClient());
- model.setGenerateServer(context.isGenerateServer());
- model.setSoap12Binding(context.isSoap12Binding());
- model.setGenerateWrapperFaultBeans(context.isGenerateWrapperFaultBeans());
- model.setGenerateWSDL(context.isGenerateWSDL());
- model.setUseSpringApplicationContext(context.isUseSpringApplicationContext());
- model.setVerbose(context.isVerbose());
-
- String className = JDTUtils.getClassName(model.getProjectName(), model.getJavaStartingPoint());
- model.setWsdlFileName(className.toLowerCase(Locale.getDefault()) + ".wsdl"); //$NON-NLS-1$
- } catch (JavaModelException jme) {
- status = jme.getStatus();
- CXFCreationCorePlugin.log(status);
- }
- return status;
- }
-
- public CXFDataModel getJava2WSDataModel() {
- return model;
- }
-
- public IType getJavaStartingPointType() {
- String projectName = model.getProjectName();
- String javaStartingPoint = model.getJavaStartingPoint();
-
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- IType startingPointType = JDTUtils.getType(javaProject, javaStartingPoint);
- return startingPointType;
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java
deleted file mode 100644
index 6513cb8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java
+++ /dev/null
@@ -1,171 +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.creation.core.commands;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-
-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.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor;
-import org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
-import org.eclipse.ltk.ui.refactoring.RefactoringUI;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSSelectSEICommand extends AbstractDataModelOperation {
- private Change undoExtractInterfaceChange;
-
- private Java2WSDataModel model;
-
- private IType startingPointType;
-
- public Java2WSSelectSEICommand(Java2WSDataModel model) {
- this.model = model;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- try {
- String projectName = model.getProjectName();
- String javaStartingPoint = model.getJavaStartingPoint();
-
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- startingPointType = JDTUtils.getType(javaProject, javaStartingPoint);
-
- if (startingPointType.isInterface()) {
- model.setFullyQualifiedJavaInterfaceName(startingPointType.getFullyQualifiedName());
- } else if (startingPointType.isClass()) {
- model.setFullyQualifiedJavaClassName(startingPointType.getFullyQualifiedName());
- if (model.isUseServiceEndpointInterface() && model.isExtractInterface()) {
- extractInterface(startingPointType, monitor);
- }
- }
- } catch (JavaModelException jme) {
- status = jme.getStatus();
- CXFCreationCorePlugin.log(status);
- }
-
- return status;
- }
-
- private void extractInterface(IType type, IProgressMonitor monitor) {
- try {
- final ExtractInterfaceProcessor extractInterfaceProcessor = new ExtractInterfaceProcessor(type,
- JavaPreferencesSettings.getCodeGenerationSettings(type.getJavaProject()));
- Refactoring extractInterfaceRefactoring = new ProcessorBasedRefactoring(extractInterfaceProcessor) {
-
- @Override
- public RefactoringProcessor getProcessor() {
- return extractInterfaceProcessor;
- }
- };
- extractInterfaceProcessor.setTypeName(model.getServiceEndpointInterfaceName());
- extractInterfaceProcessor.setReplace(false);
-
- Set<IMethod> methods = model.getMethodMap().keySet();
- extractInterfaceProcessor.setExtractedMembers(methods.toArray(new IMember[methods.size()]));
- extractInterfaceProcessor.setAbstract(false);
- extractInterfaceProcessor.setPublic(true);
- extractInterfaceProcessor.setComments(false);
- extractInterfaceProcessor.setInstanceOf(false);
-
- CreateChangeOperation createChangeOperation = new CreateChangeOperation(
- new CheckConditionsOperation(extractInterfaceRefactoring,
- CheckConditionsOperation.FINAL_CONDITIONS), RefactoringCore
- .getConditionCheckingFailedSeverity());
-
- PerformChangeOperation performChangeOperation = new PerformChangeOperation(createChangeOperation);
-
- WorkbenchRunnableAdapter adapter = new WorkbenchRunnableAdapter(performChangeOperation);
- PlatformUI.getWorkbench().getProgressService().runInUI(
- new BusyIndicatorRunnableContext(), adapter, adapter.getSchedulingRule());
-
- if (performChangeOperation.changeExecuted()) {
- String packageName = type.getPackageFragment().getElementName();
- if (packageName.trim().length() > 0) {
- packageName += ".";
- }
- String fullyQualifiedJavaInterfaceName = packageName + extractInterfaceProcessor.getTypeName();
- model.setFullyQualifiedJavaInterfaceName(fullyQualifiedJavaInterfaceName);
- model.setMethodMap(CXFModelUtils.getMethodMap(JDTUtils.getType(model.getProjectName(),
- fullyQualifiedJavaInterfaceName), model));
-
- undoExtractInterfaceChange = performChangeOperation.getUndoChange();
- }
- } catch (JavaModelException jme) {
- CXFCreationCorePlugin.log(jme.getStatus());
- } catch (InvocationTargetException ite) {
- CXFCreationCorePlugin.log(ite);
- } catch (InterruptedException ie) {
- CXFCreationCorePlugin.log(ie);
- }
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- if (undoExtractInterfaceChange != null) {
- try {
- PerformChangeOperation changeOperation = RefactoringUI
- .createUIAwareChangeOperation(undoExtractInterfaceChange);
-
- WorkbenchRunnableAdapter adapter= new WorkbenchRunnableAdapter(changeOperation);
- PlatformUI.getWorkbench().getProgressService().runInUI(
- new BusyIndicatorRunnableContext(), adapter, adapter.getSchedulingRule());
-
- if (!startingPointType.getCompilationUnit().isConsistent()) {
- startingPointType.getCompilationUnit().makeConsistent(monitor);
- }
-
- model.setMethodMap(CXFModelUtils.getMethodMap(startingPointType, model));
-
- } catch (JavaModelException jme) {
- status = jme.getStatus();
- CXFCreationCorePlugin.log(status);
- } catch (InvocationTargetException ite) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ite.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- } catch (InterruptedException ie) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ie.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- }
- }
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java
deleted file mode 100644
index a4db1c3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java
+++ /dev/null
@@ -1,125 +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.creation.core.commands;
-
-import java.io.IOException;
-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.core.model.CXFDataModel;
-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.resources.WebContentChangeListener;
-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.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-/**
- * Provides a wrapper around the <code>org.apache.cxf.tools.wsdlto.WSDLToJava</code> command.
- *
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaCommand extends AbstractDataModelOperation {
- public static final String CXF_TOOL_CLASS_NAME = "org.apache.cxf.tools.wsdlto.WSDLToJava"; //$NON-NLS-1$
-
- private WSDL2JavaDataModel model;
- private IWebService ws;
-
- private JavaResourceChangeListener javaResourceChangeListener;
- private WebContentChangeListener webContentChangeListener;
-
- public WSDL2JavaCommand(WSDL2JavaDataModel model, IWebService ws) {
- this.model = model;
- this.ws = ws;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- javaResourceChangeListener = new JavaResourceChangeListener(model.getJavaSourceFolder());
- webContentChangeListener = new WebContentChangeListener(model.getProjectName());
-
- ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
- IResourceChangeEvent.POST_CHANGE);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener,
- IResourceChangeEvent.POST_CHANGE);
-
- String projectName = model.getProjectName();
-
- //TODO revisit
- ws.getWebServiceInfo().setImplURLs(new String[] {projectName + "/Impl.java"}); //$NON-NLS-1$
-
- String[] progArgs = CommandLineUtils.getWSDL2JavaProgramArguments(model);
-
- try {
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- LaunchUtils.launch(javaProject, CXF_TOOL_CLASS_NAME, progArgs);
- FileUtils.copyW2JFilesFromTmp(model);
-
- if (model.isGenerateImplementation()) {
- SpringUtils.createConfigurationFromWSDL(model);
- }
-
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFCreationCorePlugin.log(status);
- } catch (IOException ioe) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- } finally {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
- FileUtils.refreshProject(projectName, monitor);
- }
-
- 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());
- changedResources.addAll(webContentChangeListener.getChangedResources());
- if (changedResources.size() > 0) {
- for (IResource resource : changedResources) {
- try {
- resource.delete(true, monitor);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFCreationCorePlugin.log(status);
- }
- }
- }
- return status;
- }
-
- public CXFDataModel getCXFDataModel() {
- return model;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java
deleted file mode 100644
index 3681ab4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java
+++ /dev/null
@@ -1,236 +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.creation.core.commands;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.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.resources.WebContentChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.WSDLUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaDefaultingCommand extends AbstractDataModelOperation {
- private WSDL2JavaDataModel model;
- private String projectName;
- private String inputURL;
-
- private WebContentChangeListener webContentChangeListener;
-
- public WSDL2JavaDefaultingCommand(WSDL2JavaDataModel model, String projectName, String inputURL) {
- this.model = model;
- this.projectName = projectName;
- this.inputURL = inputURL;
- }
-
- @Override
- @SuppressWarnings({ "unchecked", "deprecation" })
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
-
- webContentChangeListener = new WebContentChangeListener(projectName);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener,
- IResourceChangeEvent.POST_CHANGE);
-
- WSDL2JavaPersistentContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- model.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
- model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
- //
- model.setGenerateImplementation(context.isGenerateImplementation());
- model.setGenerateServer(context.isGenerateServer());
- model.setDatabinding(context.getDatabinding());
- model.setFrontend(context.getFrontend());
- model.setWsdlVersion(context.getWsdlVersion());
- model.setGenerateAntBuildFile(context.isGenerateAntBuildFile());
- 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.setAutoNameResolution(context.isAutoNameResolution());
- model.setNoAddressBinding(context.isNoAddressBinding());
- model.setUseSpringApplicationContext(context.isUseSpringApplicationContext());
- model.setJavaSourceFolder(JDTUtils.getJavaProjectSourceDirectoryPath(model.getProjectName()));
-
- try {
- Definition definition = null;
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject project = workspace.getRoot().getProject(projectName);
- URL wsdlUrl = new URL(inputURL);
- model.setWsdlURL(wsdlUrl);
- if (wsdlUrl.getProtocol().equals("file")) { //$NON-NLS-1$
- if (!FileUtils.isFileInWebContentFolder(project, new Path(wsdlUrl.getPath()))) {
- IFolder wsdlFolder = WSDLUtils.getWSDLFolder(project);
- IPath wsdlFolderPath = wsdlFolder.getLocation();
- File fileToCopy = new File(wsdlUrl.toURI());
- WSDLCopier copier = new WSDLCopier();
- //for Eclipse 3.3 compatibility
- copier.setSourceURI(wsdlUrl.toExternalForm());
- copier.setTargetFolderURI(wsdlFolder.getLocationURI().toString());
- //copier.setTargetFolderURI(wsdlFolderPath.toFile().toString());
- workspace.run(copier, monitor);
- wsdlFolder.refreshLocal(IResource.DEPTH_ONE, monitor);
- File wsdlFile = wsdlFolderPath.addTrailingSeparator().append(fileToCopy.getName()).toFile();
- model.setWsdlURL(wsdlFile.toURL());
- }
- definition = WSDLUtils.readWSDL(model.getWsdlURL());
- if (definition != null) {
- setTNSOnModel(definition);
-
- 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);
- }
- }
- } else {
- String filename = ""; //$NON-NLS-1$
- definition = WSDLUtils.readWSDL(wsdlUrl);
- if (definition != null) {
- Map servicesMap = definition.getServices();
- Set<Map.Entry> servicesSet = servicesMap.entrySet();
- setTNSOnModel(definition);
- for (Map.Entry serviceEntry : servicesSet) {
- Service service = (Service) serviceEntry.getValue();
- Map portsMap = service.getPorts();
- Set<Map.Entry> portsSet = portsMap.entrySet();
- for (Map.Entry portEntry : portsSet) {
- Port port = (Port) portEntry.getValue();
- PortType portType = port.getBinding().getPortType();
- QName qName = portType.getQName();
- filename = qName.getLocalPart() + WSDLUtils.WSDL_FILE_EXTENSION;
- break;
- }
- }
- }
- IPath wsdlFolderPath = WSDLUtils.getWSDLFolder(project).getLocation();
- WSDLCopier copier = new WSDLCopier();
- copier.setSourceURI(wsdlUrl.toExternalForm());
- copier.setTargetFolderURI(wsdlFolderPath.toFile().toURI().toString());
- copier.setTargetFilename(filename);
- workspace.run(copier, monitor);
-
- File wsdlFile = wsdlFolderPath.addTrailingSeparator().append(filename).toFile();
- model.setWsdlURL(wsdlFile.toURL());
- }
- model.setWsdlFileName(WSDLUtils.getWSDLFileNameFromURL(model.getWsdlURL()));
-
- IPath wsdlLocationPath = new Path(model.getWsdlURL().getPath());
- wsdlLocationPath = wsdlLocationPath.removeFirstSegments(FileUtils.getWebContentFolder(project)
- .getLocation().matchingFirstSegments(wsdlLocationPath));
-
- if (wsdlLocationPath.getDevice() != null) {
- wsdlLocationPath = wsdlLocationPath.setDevice(null);
- }
- model.setWsdlDefinition(definition);
- model.setConfigWsdlLocation(wsdlLocationPath.toString());
-
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFCreationCorePlugin.log(status);
- } catch (URISyntaxException urise) {
- status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, urise.getLocalizedMessage());
- CXFCreationCorePlugin.log(status);
- } catch (MalformedURLException murle) {
- status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, murle.getLocalizedMessage());
- CXFCreationCorePlugin.log(murle);
- }
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
- return status;
- }
-
- private void setTNSOnModel(Definition definition) {
- String targetNamespace = definition.getTargetNamespace();
- String packageName = WSDLUtils.getPackageNameFromNamespace(targetNamespace);
- model.setTargetNamespace(targetNamespace);
- model.getIncludedNamespaces().put(targetNamespace, packageName);
- }
-
- public WSDL2JavaDataModel getWSDL2JavaDataModel() {
- return model;
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- List<IResource> changedResources = new ArrayList<IResource>();
- changedResources.addAll(webContentChangeListener.getChangedResources());
- if (changedResources.size() > 0) {
- for (IResource resource : changedResources) {
- try {
- resource.delete(true, monitor);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFCreationCorePlugin.log(status);
- }
- }
- }
-
- model.getBindingFiles().clear();
- model.getIncludedNamespaces().clear();
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
deleted file mode 100644
index 1365ed4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
+++ /dev/null
@@ -1,103 +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.creation.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This is stop gap workaround for bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243286">#243286</a>
- * and <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243290">#243290</a>
- *
- * @author sclarke
- *
- */
-public class WSDL2JavaProjectSelectionCommand extends AbstractDataModelOperation {
- private WSDL2JavaDataModel model;
- private IProject initialProject;
- private IProject serverProject;
- private IProject currentProject;
-
- public WSDL2JavaProjectSelectionCommand(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
-
- if (currentProject == null && initialProject == null && serverProject != null) {
- status = Status.OK_STATUS;
- model.setProjectName(serverProject.getName());
- return status;
- }
-
- if (currentProject == null && initialProject != null && !initialProject.equals(serverProject)) {
- status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
- CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
- serverProject.getName(), initialProject.getName()}));
- } else if (initialProject == null && currentProject != null && !currentProject.equals(serverProject)) {
- status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
- CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
- serverProject.getName(), currentProject.getName()}));
- } else if (initialProject != null && currentProject != null && !currentProject.equals(serverProject)) {
- status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
- CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
- serverProject.getName(), currentProject.getName()}));
- } else {
- model.setProjectName(serverProject.getProject().getName());
- status = Status.OK_STATUS;
- }
- return status;
- }
-
- /*
- * The value to test against. Make sure the "Service Project"
- * and the project that contains the wsdl file match.
- */
- public void setServerProject(IProject serverProject) {
- this.serverProject = serverProject;
- }
-
- /*
- *
- * The initial project will be null when there's nothing selected in the project explorer
- * This forces the user to make a selection thus setting the project current project
- * below.
- *
- * If there was an initial selection and the user changes from one top down service
- * type to another then we had to check.
- */
- public void setInitialProject(IProject project) {
- this.initialProject = project;
- }
-
- /*
- * If there was an initial selection in the project explorer the above value is set and
- * this is set to null.
- *
- * This will change however if the user modifies the text field or browses for a
- * wsdl file. Upon selecting a file in a valid location, this value gets set.
- * No problem in that situation.
- */
- public void setProject(IProject project) {
- this.currentProject = project;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project b/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project
deleted file mode 100644
index 2c253e7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.creation.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8cadd13..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:55 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 189f237..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.creation.ui;singleton:=true
-Bundle-Version: 0.3.7.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.creation.ui,org.eclipse.jst.ws.internal.cxf.creation.ui.widgets,org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.jst.ws.cxf.creation.core,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.command.env.ui,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.jst.ws.cxf.ui,
- org.eclipse.jst.ws.cxf.consumption.ui,
- org.eclipse.wst.command.env,
- org.eclipse.jst.ws.creation.ui,
- org.eclipse.jst.ws,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.emf.common,
- javax.wsdl,
- org.eclipse.ui.editors
-Bundle-ActivationPolicy: lazy
-Ant-Version: Apache Ant 1.7.0
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.creation.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.creation.ui/build.properties
deleted file mode 100644
index 4df2950..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- icons/,\
- .,\
- plugin.properties,\
- plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/disabled.gif b/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/disabled.gif
deleted file mode 100644
index ba42e76..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/disabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/false.gif b/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/false.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/false.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/true.gif b/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/true.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/true.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.properties
deleted file mode 100644
index c7a3e26..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.properties
+++ /dev/null
@@ -1,15 +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 Creation UI (Incubation)
-pluginProvider=Eclipse.org
-
-CXF_WS_RUNTIME_LABEL=Apache CXF 2.x
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.xml
deleted file mode 100644
index f254680..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
- <runtime
- id="org.eclipse.jst.ws.cxf.cxfWebServiceRT"
- label="%CXF_WS_RUNTIME_LABEL"
- serverRequired="false"/>
- </extension>
-
- <!-- define support for CXF JAX-WS Java First and WSDL First in web projects -->
- <extension point="org.eclipse.jst.ws.consumption.ui.serviceRuntimes">
- <serviceRuntime
- id="org.eclipse.jst.ws.cxf.creation.java"
- serviceImplementationTypeId="org.eclipse.jst.ws.cxf.wsImpl.java"
- runtimeId="org.eclipse.jst.ws.cxf.cxfWebServiceRT"
- bottomUp="true"
- topDown="true"
- class="org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt.CXFWebServiceRuntime">
-
- <required-facet-version facet="jst.web" version="2.4" allow-newer="true"/>
- <required-facet-version facet="jst.java" version="5.0" allow-newer="true"/>
- <required-facet-version facet="cxf.core" version="1.0" allow-newer="true"/>
- </serviceRuntime>
- </extension>
-
- <!-- define support for CXF Java clients in Web projects -->
- <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
- <clientRuntime
- id="org.eclipse.jst.ws.cxf.consumption.web"
- clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
- runtimeId="org.eclipse.jst.ws.cxf.cxfWebServiceRT"
- class="org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt.CXFWebServiceRuntime">
-
- <required-facet-version facet="jst.web" version="2.4" allow-newer="true"/>
- <required-facet-version facet="jst.java" version="5.0" allow-newer="true"/>
- <required-facet-version facet="cxf.core" version="1.0" allow-newer="true"/>
- </clientRuntime>
- </extension>
-
- <!-- bugs #243286 #243290 -->
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.WSDL2JavaProjectSelectionWidgetFactory"
- id="ProjectSelectionConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaProjectSelectionCommand"/>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.Java2WSSelectSEIWidgetFactory"
- id="Java2WSPreCheckConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSSelectSEICommand">
- </widgetFactory>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.JAXWSAnnotateWidgetFactory"
- id="JAXWSAnnotateConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.JAXWSAnnotateJavaCommand">
- </widgetFactory>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.Java2WSConfigWidgetFactory"
- id="Java2WSConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSCommand">
- </widgetFactory>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.WSDL2JavaConfigWidgetFactory"
- id="WSDL2JavaConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaCommand">
- </widgetFactory>
- </extension>
-
- </plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIMessages.java
deleted file mode 100644
index 9a911ab..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIMessages.java
+++ /dev/null
@@ -1,59 +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.creation.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author sclarke
- */
-public class CXFCreationUIMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUImessages"; //$NON-NLS-1$
- public static String JAVA2WS_ENTER_SEI_NAME;
- public static String JAVA2WS_SELECT_SEI_EXTRACTED_METHODS;
- public static String JAVA2WS_SELECT_SEI_FROM_TYPE_HIERARCHY;
- public static String JAVA2WS_SELECT_SEI_OPTION;
- public static String JAVA2WS_ENTER_VALID_WSDL_NAME;
-
- public static String JAVA2WS_CLASS_CONFIG_PAGE_TITLE;
- public static String JAVA2WS_CLASS_CONFIG_PAGE_DESCRIPTION;
-
- public static String JAVA2WS_INTERFACE_CONFIG_PAGE_TITLE;
- public static String JAVA2WS_INTERFACE_CONFIG_PAGE_DESCRIPTION;
-
- public static String JAVA2WS_JAXWS_ANNOTATE_PAGE_TITLE;
- public static String JAVA2WS_JAXWS_ANNOTATE_PAGE_DESCRIPTION;
-
- public static String JAVA2WS_PAGE_TITLE;
- public static String JAVA2WS_PAGE_DESCRIPTION;
- public static String JAXWS_ANNOTATE_JJAVA_WIDGET_PREVIEW;
- public static String JAXWS_ANNOTATE_JJAVA_WIDGET_SELECT_METHOD_TO_ANNOTATE;
-
- public static String WSDL2JAVA_PAGE_TITLE;
- public static String WSDL2JAVA_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_DEFAULTS_PAGE_TITLE;
- public static String WSDL2JAVA_DEFAULTS_PAGE_DESCRIPTION;
-
- public static String JAVA2WS_GROUP_LABEL;
-
- public static String WSDL2JAVA_GROUP_LABEL;
- public static String WSDL2JAVA_XJC_ARG_GROUP_LABEL;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, CXFCreationUIMessages.class);
- }
-
- private CXFCreationUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java
deleted file mode 100644
index f0de6f2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java
+++ /dev/null
@@ -1,91 +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.creation.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
- *
- * @author sclarke
- */
-public class CXFCreationUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.creation.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFCreationUIPlugin plugin;
-
- /**
- * The constructor
- */
- public CXFCreationUIPlugin() {
- }
-
- /*
- * (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 CXFCreationUIPlugin 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) {
- CXFCreationUIPlugin.log(new Status(severity, CXFCreationUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFCreationUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFCreationUIPlugin.log(new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- exception.getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUImessages.properties b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUImessages.properties
deleted file mode 100644
index f0ab9fe..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUImessages.properties
+++ /dev/null
@@ -1,47 +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
-###############################################################################
-
-#Java2WS Pre Config Widget Factory
-JAVA2WS_CLASS_CONFIG_PAGE_TITLE={0} {1} Web Service Java Class Starting Point Configuration
-JAVA2WS_CLASS_CONFIG_PAGE_DESCRIPTION=Select the Service Endpoint Interface (SEI) from the Type Hierarchy or Extract an SEI from the class
-
-JAVA2WS_INTERFACE_CONFIG_PAGE_TITLE={0} {1} Web Service Java Interface Starting Point Configuration
-JAXWS_ANNOTATE_JJAVA_WIDGET_PREVIEW=Preview:
-JAVA2WS_INTERFACE_CONFIG_PAGE_DESCRIPTION=Select an implementation for the interface. Optional step for configuration purposes.
-
-#Java2WS Config Widget Factory
-JAVA2WS_JAXWS_ANNOTATE_PAGE_TITLE={0} {1} Web Service Annotate Java Configuration
-JAVA2WS_JAXWS_ANNOTATE_PAGE_DESCRIPTION=Set the Annotation options on this page
-
-JAVA2WS_PAGE_TITLE={0} {1} Web Service Java2WS Configuration
-JAVA2WS_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-#WSDL2Java Config Widget Factory
-WSDL2JAVA_PAGE_TITLE={0} {1} Web Service WSDL2Java Configuration
-WSDL2JAVA_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-WSDL2JAVA_DEFAULTS_PAGE_TITLE={0} {1} Web Service WSDL2Java Configuration
-WSDL2JAVA_DEFAULTS_PAGE_DESCRIPTION=The page allows the overriding of the default preferences for this Web Service generation
-
-#Java2WS Config Widget
-JAVA2WS_GROUP_LABEL=Java2WS Generation Options:
-
-JAVA2WS_ENTER_SEI_NAME=Please enter the name of the SEI to extract
-JAVA2WS_SELECT_SEI_EXTRACTED_METHODS=Please select the methods you wish to extract from the {0} class
-JAVA2WS_SELECT_SEI_FROM_TYPE_HIERARCHY=Please select an Interface from the Type Hierarchy
-JAVA2WS_SELECT_SEI_OPTION=Please select an SEI option
-
-JAVA2WS_ENTER_VALID_WSDL_NAME=Please enter a valid WSDL File name
-
-#WSDL2Java Defaults Config Widget
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options
-WSDL2JAVA_XJC_ARG_GROUP_LABEL=XJC Arguments
-JAXWS_ANNOTATE_JJAVA_WIDGET_SELECT_METHOD_TO_ANNOTATE=Select the Methods to annotate:
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/selection/IStructuredSelectionToIProjectTransformer.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/selection/IStructuredSelectionToIProjectTransformer.java
deleted file mode 100644
index 4c7851d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/selection/IStructuredSelectionToIProjectTransformer.java
+++ /dev/null
@@ -1,33 +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.creation.ui.selection;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class IStructuredSelectionToIProjectTransformer implements Transformer {
-
- public Object transform(Object value) {
- IStructuredSelection structuredSelection = (IStructuredSelection) value;
- Object firstElement = structuredSelection.getFirstElement();
- if (firstElement instanceof IResource) {
- IResource resource = (IResource) firstElement;
- return resource.getProject();
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/viewers/AnnotationColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/viewers/AnnotationColumnLabelProvider.java
deleted file mode 100644
index e2826b4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/viewers/AnnotationColumnLabelProvider.java
+++ /dev/null
@@ -1,103 +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.creation.ui.viewers;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.internal.core.SourceMethod;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class AnnotationColumnLabelProvider extends ColumnLabelProvider {
- private Image addAnnotationImage;
- private Image removeAnnotationImage;
- private Image disabled;
-
- private Map<IMethod, Map<String, Boolean>> methodMap;
- private String annotationKey;
- private IType type;
-
- public AnnotationColumnLabelProvider(Java2WSDataModel model, String annotationKey, IType type) {
- this.methodMap = model.getMethodMap();
- this.annotationKey = annotationKey;
- this.type = type;
- addAnnotationImage = CXFCreationUIPlugin.imageDescriptorFromPlugin(CXFCreationUIPlugin.PLUGIN_ID,
- "icons/obj16/true.gif").createImage(); //$NON-NLS-1$
- removeAnnotationImage = CXFCreationUIPlugin.imageDescriptorFromPlugin(CXFCreationUIPlugin.PLUGIN_ID,
- "icons/obj16/false.gif").createImage(); //$NON-NLS-1$
- disabled = CXFCreationUIPlugin.imageDescriptorFromPlugin(CXFCreationUIPlugin.PLUGIN_ID,
- "icons/obj16/disabled.gif").createImage(); //$NON-NLS-1$
- }
-
- public String getText(Object element) {
- return ""; //$NON-NLS-1$
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof SourceMethod) {
- if (methodMap == null || annotationKey == null || type == null) {
- return null;
- }
-
- IMethod method = (SourceMethod) element;
-
- if (annotationKey == CXFModelUtils.WEB_PARAM) {
- List<SingleVariableDeclaration> parameters = AnnotationUtils.getMethodParameters(type,
- method);
-
- if (parameters.size() == 0) {
- return disabled;
- }
- for (SingleVariableDeclaration parameter : parameters) {
- if (AnnotationUtils.isAnnotationPresent(parameter, annotationKey)) {
- return disabled;
- }
- }
- }
-
- if (AnnotationUtils.isAnnotationPresent(method, annotationKey)) {
- return disabled;
- }
-
- if (methodMap.get(method) != null) {
- Boolean addAnnotation = methodMap.get(method).get(annotationKey);
- if (addAnnotation) {
- return addAnnotationImage;
- } else {
- return removeAnnotationImage;
- }
- }
- }
- return null;
- }
-
- @Override
- public void dispose() {
- super.dispose();
- addAnnotationImage.dispose();
- removeAnnotationImage.dispose();
- disabled.dispose();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateJavaWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateJavaWidget.java
deleted file mode 100644
index 665ad76..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateJavaWidget.java
+++ /dev/null
@@ -1,505 +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.creation.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-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.SingleVariableDeclaration;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.jdt.internal.core.SourceMethod;
-import org.eclipse.jdt.internal.core.SourceType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaSourceViewer;
-import org.eclipse.jdt.internal.ui.text.SimpleJavaSourceViewerConfiguration;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jdt.ui.text.IColorManager;
-import org.eclipse.jdt.ui.text.IJavaPartitions;
-import org.eclipse.jdt.ui.text.JavaTextTools;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.FindReplaceDocumentAdapter;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.viewers.AnnotationColumnLabelProvider;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-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.Listener;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class JAXWSAnnotateJavaWidget extends SimpleWidgetDataContributor {
- IStatus status = Status.OK_STATUS;
-
- private IType type;
- private Java2WSDataModel model;
- private TreeViewer javaTreeViewer;
- private SourceViewer annotationPreviewViewer;
-
- private TreeViewerColumn webMethodViewerColumn;
- private TreeViewerColumn webParamViewerColumn;
- private TreeViewerColumn requestWrapperViewerColumn;
- private TreeViewerColumn responceWrapperViewerColumn;
-
- public JAXWSAnnotateJavaWidget() {
- }
-
- public void setJava2WSDataModel(Java2WSDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- SashForm sashForm = new SashForm(parent, SWT.VERTICAL | SWT.SMOOTH);
- GridLayout gridLayout = new GridLayout(1, true);
- sashForm.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- sashForm.setLayoutData(gridData);
-
- Composite javaTreecomposite = new Composite(sashForm, SWT.NONE);
- gridLayout = new GridLayout(1, true);
- javaTreecomposite.setLayout(gridLayout);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- javaTreecomposite.setLayoutData(gridData);
-
- Label outlineLabel = new Label(javaTreecomposite, SWT.NONE);
- outlineLabel.setText(CXFCreationUIMessages.JAXWS_ANNOTATE_JJAVA_WIDGET_SELECT_METHOD_TO_ANNOTATE);
-
- Tree javaTree = new Tree(javaTreecomposite, SWT.FULL_SELECTION | SWT.BORDER | SWT.V_SCROLL
- | SWT.H_SCROLL);
- javaTreeViewer = new TreeViewer(javaTree);
-
- javaTree.setHeaderVisible(true);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.heightHint = 10;
- gridData.widthHint = 200;
- javaTree.setLayoutData(gridData);
-
- TreeViewerColumn classViewerColumn = new TreeViewerColumn(javaTreeViewer, SWT.NONE);
- TreeColumn classColumn = classViewerColumn.getColumn();
- classColumn.setWidth(200);
- classColumn.setMoveable(false);
-
- final JavaElementLabelProvider javaElementLabelProvider = new JavaElementLabelProvider();
- classViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public Image getImage(Object element) {
- return javaElementLabelProvider.getImage(element);
- }
-
- @Override
- public String getText(Object element) {
- return javaElementLabelProvider.getText(element);
- }
- });
-
- javaTreeViewer.setContentProvider(new StandardJavaElementContentProvider(true) {
- @Override
- public Object[] getChildren(Object element) {
- if (element instanceof ICompilationUnit) {
- try {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType[] types = compilationUnit.getTypes();
- for (IType type : types) {
- if (type instanceof SourceType) {
- return new Object[] {type};
- }
- }
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
- }
-
- if (element instanceof SourceType) {
- try {
- SourceType sourceType = (SourceType) element;
- List<IMethod> publicMethods = new ArrayList<IMethod>();
- IMethod[] methods = sourceType.getMethods();
- for (IMethod method : methods) {
- if (JDTUtils.isPublicMethod(method)) {
- publicMethods.add(method);
- }
- }
- return publicMethods.toArray(new Object[publicMethods.size()]);
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
- }
- return NO_CHILDREN;
- }
-
- @Override
- public boolean hasChildren(Object element) {
- return getChildren(element).length > 0;
- }
- });
-
- javaTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- if (event.getSelection() instanceof TreeSelection) {
- TreeSelection treeSelection = (TreeSelection) event.getSelection();
- Object firstElement = treeSelection.getFirstElement();
-
- IDocument document = annotationPreviewViewer.getDocument();
- FindReplaceDocumentAdapter findReplaceDocumentAdapter =
- new FindReplaceDocumentAdapter(document);
- try {
- if (firstElement instanceof SourceType) {
- SourceType sourceType = (SourceType) firstElement;
- String elementName = sourceType.getElementName();
-
- String regex = "\\bpublic\\W+(?:\\w+\\W+){1,3}?" + elementName + "\\b";
- IRegion region = findReplaceDocumentAdapter.find(0, regex, true, true, false,
- true);
-
- annotationPreviewViewer.setSelectedRange(region.getOffset(), region.getLength());
- annotationPreviewViewer.revealRange(region.getOffset(), region.getLength());
- } else if (firstElement instanceof SourceMethod) {
- SourceMethod sourceMethod = (SourceMethod) firstElement;
- String elementName = sourceMethod.getElementName();
-
- String regex = "\\bpublic\\W+(?:\\w+\\W+){1,3}?" + elementName + "\\s*+\\(.*";
-
- String[] parameterTypes = sourceMethod.getParameterTypes();
- String[] paramterNames = sourceMethod.getParameterNames();
-
- for (int i = 0; i < parameterTypes.length; i++) {
- String typeName = Signature.toString(Signature.getTypeErasure(
- parameterTypes[i]));
- regex += typeName;
- regex += "\\s*+";
- regex += paramterNames[i];
- if (i < parameterTypes.length - 1) {
- regex += "\\s*+,.*";
- }
- }
- regex += "\\s*+\\)";
-
- IRegion region = findReplaceDocumentAdapter.find(0, regex, true, true, false,
- true);
-
- if (region != null) {
- IRegion elementNameRegion = findReplaceDocumentAdapter.find(
- region.getOffset(), elementName, true, true, true, false);
- if (elementNameRegion != null) {
- annotationPreviewViewer.setSelectedRange(elementNameRegion.getOffset(),
- elementNameRegion.getLength());
- annotationPreviewViewer.revealRange(elementNameRegion.getOffset(),
- elementNameRegion.getLength());
- }
- }
- }
- } catch (BadLocationException ble) {
- CXFCreationUIPlugin.log(ble);
- } catch (JavaModelException jme) {
- jme.printStackTrace();
- }
- }
- }
- });
-
- createWebMethodViewerColumn(javaTreeViewer);
- createWebParamViewerColumn(javaTreeViewer);
- createRequestWrapperViewerColumn(javaTreeViewer);
- createResponseWrapperViewerColumn(javaTreeViewer);
-
- javaTreeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS);
- javaTreeViewer.expandAll();
-
- Composite previewComposite = new Composite(sashForm, SWT.NONE);
- gridLayout = new GridLayout(1, true);
- previewComposite.setLayout(gridLayout);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- javaTreecomposite.setLayoutData(gridData);
-
- Label previewLabel = new Label(previewComposite, SWT.NONE);
- previewLabel.setText(CXFCreationUIMessages.JAXWS_ANNOTATE_JJAVA_WIDGET_PREVIEW);
-
- annotationPreviewViewer = createAnnotationPreviewer(previewComposite, SWT.READ_ONLY | SWT.V_SCROLL
- | SWT.H_SCROLL | SWT.BORDER);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.heightHint = 10;
- gridData.widthHint = 200;
- annotationPreviewViewer.getControl().setLayoutData(gridData);
-
- sashForm.setWeights(new int[]{50, 50});
-
- return this;
- }
-
- @Override
- public void internalize() {
- type = null;
- updateLabelProviders();
- javaTreeViewer.setInput(getType().getTypeRoot());
- javaTreeViewer.refresh();
- handleAnnotation(getType());
- }
-
- private IType getType() {
- if (type != null) {
- return type;
- }
- if (model.getFullyQualifiedJavaInterfaceName() != null) {
- type = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
- .getFullyQualifiedJavaInterfaceName());
- } else if (model.getFullyQualifiedJavaClassName() != null) {
- type =JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
- .getFullyQualifiedJavaClassName());
- }
-
- if (type == null) {
- type = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
- .getJavaStartingPoint());
- }
-
- model.setMethodMap(CXFModelUtils.getMethodMap(type, model));
-
- return type;
- }
-
- private TreeViewerColumn createWebMethodViewerColumn(TreeViewer treeViewer) {
- webMethodViewerColumn = new TreeViewerColumn(treeViewer, SWT.CENTER);
- TreeColumn webMethodColumn = webMethodViewerColumn.getColumn();
- webMethodColumn.setText("@" + CXFModelUtils.WEB_METHOD); //$NON-NLS-1$
- webMethodColumn.setWidth(100);
- webMethodColumn.setAlignment(SWT.CENTER);
- webMethodColumn.setMoveable(false);
- webMethodViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
- CXFModelUtils.WEB_METHOD, getType()));
- webMethodViewerColumn.setEditingSupport(new AnnotationEditingSupport(treeViewer,
- CXFModelUtils.WEB_METHOD));
- return webMethodViewerColumn;
- }
-
- private TreeViewerColumn createWebParamViewerColumn(TreeViewer treeViewer) {
- webParamViewerColumn = new TreeViewerColumn(treeViewer, SWT.CENTER);
- TreeColumn webParamColumn = webParamViewerColumn.getColumn();
- webParamColumn.setText("@" + CXFModelUtils.WEB_PARAM); //$NON-NLS-1$
- webParamColumn.setWidth(100);
- webParamColumn.setAlignment(SWT.CENTER);
- webParamColumn.setMoveable(false);
- webParamViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
- CXFModelUtils.WEB_PARAM, getType()));
- webParamViewerColumn.setEditingSupport(new AnnotationEditingSupport(treeViewer,
- CXFModelUtils.WEB_PARAM));
- return webParamViewerColumn;
- }
-
- private TreeViewerColumn createRequestWrapperViewerColumn(TreeViewer treeViewer) {
- requestWrapperViewerColumn = new TreeViewerColumn(treeViewer, SWT.CENTER);
- TreeColumn createRequestWrapperColumn = requestWrapperViewerColumn.getColumn();
- createRequestWrapperColumn.setText("@" + CXFModelUtils.REQUEST_WRAPPER); //$NON-NLS-1$
- createRequestWrapperColumn.setWidth(100);
- createRequestWrapperColumn.setMoveable(false);
- requestWrapperViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
- CXFModelUtils.REQUEST_WRAPPER, getType()));
- requestWrapperViewerColumn.setEditingSupport(new AnnotationEditingSupport(treeViewer,
- CXFModelUtils.REQUEST_WRAPPER));
- return requestWrapperViewerColumn;
- }
-
- private TreeViewerColumn createResponseWrapperViewerColumn(TreeViewer treeViewer) {
- responceWrapperViewerColumn = new TreeViewerColumn(treeViewer, SWT.CENTER);
- TreeColumn responceWrapperColumn = responceWrapperViewerColumn.getColumn();
- responceWrapperColumn.setText("@" + CXFModelUtils.RESPONSE_WRAPPER); //$NON-NLS-1$
- responceWrapperColumn.setWidth(100);
- responceWrapperColumn.setMoveable(false);
- responceWrapperViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
- CXFModelUtils.RESPONSE_WRAPPER, getType()));
- responceWrapperViewerColumn.setEditingSupport(new AnnotationEditingSupport(treeViewer,
- CXFModelUtils.RESPONSE_WRAPPER));
- return responceWrapperViewerColumn;
- }
-
- private void updateLabelProviders() {
- webMethodViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
- CXFModelUtils.WEB_METHOD, getType()));
- webParamViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
- CXFModelUtils.WEB_PARAM, getType()));
- requestWrapperViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
- CXFModelUtils.REQUEST_WRAPPER, getType()));
- responceWrapperViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
- CXFModelUtils.RESPONSE_WRAPPER, getType()));
- }
-
- private void handleAnnotation(IType type) {
- try {
- annotationPreviewViewer.setRedraw(false);
-
- ICompilationUnit compilationUnit = type.getCompilationUnit();
- IProgressMonitor monitor = new NullProgressMonitor();
-
- TextFileChange textFileChange = new TextFileChange("Annotation Changes",
- (IFile)compilationUnit.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
- textFileChange.setKeepPreviewEdits(true);
-// compositeChange.setSaveMode(TextFileChange.FORCE_SAVE);
-
- CXFModelUtils.getWebServiceAnnotationChange(type, model, textFileChange);
-
- IMethod[] typeMethods = JDTUtils.getPublicMethods(type);
- for (int i = 0; i < typeMethods.length; i++) {
- IMethod method = typeMethods[i];
- Map<String, Boolean> methodAnnotationMap = model.getMethodMap().get(method);
- if (methodAnnotationMap.get(CXFModelUtils.WEB_METHOD)) {
- CXFModelUtils.getWebMethodAnnotationChange(type, method, textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.REQUEST_WRAPPER)) {
- CXFModelUtils.getRequestWrapperAnnotationChange(type, method, textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.RESPONSE_WRAPPER)) {
- CXFModelUtils.getResponseWrapperAnnotationChange(type, method, textFileChange);
- }
- if (methodAnnotationMap.get(CXFModelUtils.WEB_PARAM)) {
- List<SingleVariableDeclaration> parameters = AnnotationUtils.getMethodParameters(
- type, method);
- for (SingleVariableDeclaration parameter : parameters) {
- CXFModelUtils.getWebParamAnnotationChange(type, method, parameter, textFileChange);
- }
- }
- }
-
- CXFModelUtils.getImportsChange(compilationUnit, model, textFileChange, false);
- annotationPreviewViewer.getDocument().set(textFileChange.getPreviewContent(monitor));
-
- annotationPreviewViewer.setRedraw(true);
- } catch (CoreException ce) {
- CXFCreationUIPlugin.log(ce.getStatus());
- } catch (MalformedTreeException mte) {
- CXFCreationUIPlugin.log(mte);
- }
- }
-
- private SourceViewer createAnnotationPreviewer(Composite parent, int styles) {
- JavaPlugin javaPlugin = JavaPlugin.getDefault();
- IPreferenceStore store = javaPlugin.getCombinedPreferenceStore();
- JavaTextTools javaTextTools = javaPlugin.getJavaTextTools();
- annotationPreviewViewer = new JavaSourceViewer(parent, null, null, true, styles, store);
- IColorManager colorManager = javaTextTools.getColorManager();
- SimpleJavaSourceViewerConfiguration configuration = new SimpleJavaSourceViewerConfiguration(
- colorManager, store, null, IJavaPartitions.JAVA_PARTITIONING, true);
-
- annotationPreviewViewer.configure(configuration);
-
- Font font = JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT);
- annotationPreviewViewer.getTextWidget().setFont(font);
- annotationPreviewViewer.setEditable(false);
-
-
- String source = JDTUtils.getSourceFromType(getType());
- IDocument document = new Document(source);
-
- JavaPlugin.getDefault().getJavaTextTools().setupJavaDocumentPartitioner(document,
- IJavaPartitions.JAVA_PARTITIONING);
- annotationPreviewViewer.setDocument(document);
-
- return annotationPreviewViewer;
- }
-
- @Override
- public IStatus getStatus() {
- return status;
- }
-
- private class AnnotationEditingSupport extends EditingSupport {
- private CheckboxCellEditor checkboxCellEditor;
-
- private String annotationKey;
-
- public AnnotationEditingSupport(TreeViewer viewer, String annotationKey) {
- super(viewer);
- this.annotationKey = annotationKey;
- checkboxCellEditor = new CheckboxCellEditor(viewer.getTree());
- }
-
- @Override
- protected boolean canEdit(Object element) {
- return !AnnotationUtils.isAnnotationPresent(type.findMethods((IMethod) element)[0],
- annotationKey);
- }
-
- @Override
- protected CellEditor getCellEditor(Object element) {
- return checkboxCellEditor;
- }
-
- @Override
- protected Object getValue(Object element) {
- Boolean annotate = model.getMethodMap().get(element).get(annotationKey);
- return annotate;
- }
-
- @Override
- protected void setValue(Object element, Object value) {
- if (element instanceof SourceMethod) {
- SourceMethod method = (SourceMethod) element;
- Boolean annotate = (Boolean) value;
- Map<String, Boolean> annotationMap = model.getMethodMap().get(element);
- annotationMap.put(annotationKey, annotate);
- handleAnnotation(method.getDeclaringType());
- getViewer().refresh(true);
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateWidgetFactory.java
deleted file mode 100644
index 0fe60c3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateWidgetFactory.java
+++ /dev/null
@@ -1,69 +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.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class JAXWSAnnotateWidgetFactory implements INamedWidgetContributorFactory {
- private SimpleWidgetContributor jaxwsAnnotateWidgetContributor;
-
- private JAXWSAnnotateJavaWidget jaxwsAnnotateJavaWidget = new JAXWSAnnotateJavaWidget();
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if (jaxwsAnnotateWidgetContributor == null) {
- init();
- }
- return jaxwsAnnotateWidgetContributor;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(Java2WSDefaultingCommand.class,
- "Java2WSDataModel", JAXWSAnnotateWidgetFactory.class); //$NON-NLS-1$
- }
-
- public void setJava2WSDataModel(Java2WSDataModel model) {
- jaxwsAnnotateJavaWidget.setJava2WSDataModel(model);
- }
-
- private void init() {
- jaxwsAnnotateWidgetContributor = new SimpleWidgetContributor();
- CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
- String title = CXFCreationUIMessages.bind(
- CXFCreationUIMessages.JAVA2WS_JAXWS_ANNOTATE_PAGE_TITLE,
- new Object[]{context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
- jaxwsAnnotateWidgetContributor.setTitle(title);
- jaxwsAnnotateWidgetContributor
- .setDescription(CXFCreationUIMessages.JAVA2WS_JAXWS_ANNOTATE_PAGE_DESCRIPTION);
- jaxwsAnnotateWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return jaxwsAnnotateJavaWidget;
- }
- });
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSClassConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSClassConfigWidget.java
deleted file mode 100644
index 3751763..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSClassConfigWidget.java
+++ /dev/null
@@ -1,408 +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.creation.ui.widgets;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSClassConfigWidget extends SimpleWidgetDataContributor {
- private IStatus JAVA_TYPE_NAME_STATUS = Status.OK_STATUS;
- private IStatus JAVA_TYPE_EXISTS_STATUS = Status.OK_STATUS;
- private IStatus SEI_SELECTION_STATUS = Status.OK_STATUS;
-
- private int NUMBER_OF_PUBLIC_METHODS;
- private int NUMBER_OF_CHECKED_METHODS;
- private IMethod[] publicMethods;
-
- private Button useSEIButton;
- private Button selectSEIButton;
- private Button extractSEIButton;
-
- private Combo selectSEICombo;
- private Text seiInterfaceNameText;
-
- private CheckboxTableViewer seiMembersToExtractTableViewer;
- private Table seiMembersToExtractTable;
- private Button selectAllButton;
- private Button deselectAllButton;
-
- private Java2WSDataModel model;
- private IType startingPointType;
-
- public Java2WSClassConfigWidget() {
- }
-
- public void setJava2WSDataModel(Java2WSDataModel model) {
- this.model = model;
- }
-
- public void setJavaStartingPointType(IType startingPointType) {
- this.startingPointType = startingPointType;
- }
-
- @Override
- public void internalize() {
- useSEIButton.setSelection(false);
- selectSEIButton.setSelection(false);
- selectSEIButton.setEnabled(false);
- enableSelectSEIControls(false);
- extractSEIButton.setSelection(false);
- extractSEIButton.setEnabled(false);
- enableExtractSEIControls(false);
- seiInterfaceNameText.setText("");
- seiMembersToExtractTableViewer.setAllChecked(false);
- NUMBER_OF_CHECKED_METHODS = 0;
- }
-
- @Override
- public WidgetDataEvents addControls(Composite parent, final Listener statusListener) {
- final Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(3, false);
- composite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- composite.setLayoutData(gridData);
-
- useSEIButton = Java2WSWidgetFactory.createUseSEIButton(composite);
- useSEIButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- boolean useSEI = useSEIButton.getSelection();
- model.setUseServiceEndpointInterface(useSEI);
- selectSEIButton.setEnabled(useSEI);
- extractSEIButton.setEnabled(useSEI);
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- if (!useSEI) {
- selectSEIButton.setSelection(false);
- enableSelectSEIControls(false);
-
- extractSEIButton.setSelection(false);
- enableExtractSEIControls(false);
- }
- }
-
- });
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, true);
- gridData.horizontalSpan = 3;
- useSEIButton.setLayoutData(gridData);
-
- Label infoLabel = Java2WSWidgetFactory.createInformationLabel(composite, startingPointType);
- gridData = new GridData(SWT.FILL, SWT.CENTER, false, false);
- gridData.horizontalSpan = 3;
- gridData.widthHint = 100;
- infoLabel.setLayoutData(gridData);
-
- Label paddingLabel = Java2WSWidgetFactory.createPaddingLabel(composite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- paddingLabel.setLayoutData(gridData);
-
- selectSEIButton = Java2WSWidgetFactory.createSelectSEIButton(composite);
- selectSEIButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- enableSelectSEIControls(selectSEIButton.getSelection());
- enableExtractSEIControls(!selectSEIButton.getSelection());
- if (selectSEIButton.getSelection() && selectSEICombo.getSelectionIndex() != -1) {
- model.setFullyQualifiedJavaInterfaceName(selectSEICombo.getText());
- }
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
- });
- selectSEIButton.setSelection(false);
- selectSEIButton.setEnabled(false);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- selectSEIButton.setLayoutData(gridData);
-
- selectSEICombo = Java2WSWidgetFactory.createSelectSEICombo(composite, model, startingPointType);
- selectSEICombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- selectSEICombo.setLayoutData(gridData);
-
- paddingLabel = Java2WSWidgetFactory.createPaddingLabel(composite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- paddingLabel.setLayoutData(gridData);
-
- extractSEIButton = Java2WSWidgetFactory.createExtractSEIButton(composite);
- extractSEIButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- boolean extract = extractSEIButton.getSelection();
- model.setExtractInterface(extract);
- enableExtractSEIControls(extract);
- enableSelectSEIControls(!extract);
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
- });
- extractSEIButton.setSelection(model.isExtractInterface());
- extractSEIButton.setEnabled(false);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- extractSEIButton.setLayoutData(gridData);
-
- seiInterfaceNameText = Java2WSWidgetFactory.createSEIInterfaceNameText(composite);
- seiInterfaceNameText.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent event) {
- String interfaceName = seiInterfaceNameText.getText();
- model.setServiceEndpointInterfaceName(interfaceName);
-
- String compilationUnitName = interfaceName + ".java"; //$NON-NLS-1$
- JAVA_TYPE_NAME_STATUS = JDTUtils.validateJavaTypeName(model.getProjectName(), interfaceName);
- JAVA_TYPE_EXISTS_STATUS = JDTUtils.checkTypeExists(startingPointType, compilationUnitName);
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
- });
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- seiInterfaceNameText.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createPaddingLabel(composite);
-
- Java2WSWidgetFactory.createMemebersToExtractLabel(composite);
-
- Java2WSWidgetFactory.createPaddingLabel(composite);
- Java2WSWidgetFactory.createPaddingLabel(composite);
-
- seiMembersToExtractTableViewer = Java2WSWidgetFactory
- .createSEIMembersToExtractTableViewer(composite);
- seiMembersToExtractTable = seiMembersToExtractTableViewer.getTable();
- seiMembersToExtractTableViewer.addCheckStateListener(new ICheckStateListener() {
-
- public void checkStateChanged(CheckStateChangedEvent event) {
- Object[] checkedMethods = seiMembersToExtractTableViewer.getCheckedElements();
-
- Map<IMethod, Map<String, Boolean>> methodMap = new HashMap<IMethod, Map<String, Boolean>>();
- for (int i = 0; i < checkedMethods.length; i++) {
- methodMap.put((IMethod)checkedMethods[i], model.getAnnotationMap());
- }
- model.setMethodMap(methodMap);
-
- NUMBER_OF_CHECKED_METHODS = checkedMethods.length;
-
- if (NUMBER_OF_CHECKED_METHODS < NUMBER_OF_PUBLIC_METHODS) {
- selectAllButton.setEnabled(true);
- } else if (NUMBER_OF_CHECKED_METHODS == NUMBER_OF_PUBLIC_METHODS) {
- selectAllButton.setEnabled(false);
- }
-
- if (NUMBER_OF_CHECKED_METHODS > 0) {
- deselectAllButton.setEnabled(true);
- } else {
- deselectAllButton.setEnabled(false);
- }
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.verticalSpan = 3;
- gridData.heightHint = 100;
- seiMembersToExtractTable.setLayoutData(gridData);
-
- selectAllButton = Java2WSWidgetFactory.createSelectAllButton(composite);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- seiMembersToExtractTableViewer.setAllChecked(true);
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(true);
-
- TableItem[] checkedMethods = seiMembersToExtractTableViewer.getTable().getItems();
- for (int i = 0; i < checkedMethods.length; i++) {
- TableItem tableItem = checkedMethods[i];
- SelectionEvent selectionEvent = event;
- selectionEvent.detail = SWT.CHECK;
- selectionEvent.item = tableItem;
- seiMembersToExtractTableViewer.handleSelect(selectionEvent);
- }
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
-
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- selectAllButton.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createPaddingLabel(composite);
-
- deselectAllButton = Java2WSWidgetFactory.createDeselectAllButton(composite);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- seiMembersToExtractTableViewer.setAllChecked(false);
- selectAllButton.setEnabled(true);
- deselectAllButton.setEnabled(false);
-
- TableItem[] checkedMethods = seiMembersToExtractTableViewer.getTable().getItems();
- for (int i = 0; i < checkedMethods.length; i++) {
- TableItem tableItem = checkedMethods[i];
- SelectionEvent selectionEvent = event;
- selectionEvent.detail = SWT.CHECK;
- selectionEvent.item = tableItem;
- seiMembersToExtractTableViewer.handleSelect(selectionEvent);
- }
-
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
-
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- deselectAllButton.setLayoutData(gridData);
-
- publicMethods = JDTUtils.getPublicMethods(startingPointType);
- NUMBER_OF_PUBLIC_METHODS = publicMethods.length;
- seiMembersToExtractTableViewer.setInput(publicMethods);
-
- enableSelectSEIControls(false);
- enableExtractSEIControls(false);
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
-
- return this;
- }
-
- public void enableSelectSEIControls(boolean enable) {
- selectSEICombo.setEnabled(enable);
- }
-
- public void enableExtractSEIControls(boolean enable) {
- seiInterfaceNameText.setEnabled(enable);
- seiMembersToExtractTable.setEnabled(enable);
- if (enable && (NUMBER_OF_CHECKED_METHODS < NUMBER_OF_PUBLIC_METHODS)) {
- selectAllButton.setEnabled(true);
- }
-
- if (enable && (NUMBER_OF_CHECKED_METHODS > 0)) {
- deselectAllButton.setEnabled(true);
- }
-
- if (!enable) {
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
- }
- }
-
- @Override
- public IStatus getStatus() {
- return findMostSevere();
- }
-
- private void updateSEISelectionStatus() {
- if (useSEIButton.getSelection()) {
- if (!selectSEIButton.getSelection() && !extractSEIButton.getSelection()) {
- SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.JAVA2WS_SELECT_SEI_OPTION);
- }
-
- if (selectSEIButton.getSelection() && selectSEICombo.getText().length() == 0) {
- SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.JAVA2WS_SELECT_SEI_FROM_TYPE_HIERARCHY);
- } else if (selectSEIButton.getSelection() && selectSEICombo.getText().length() > 0) {
- SEI_SELECTION_STATUS = Status.OK_STATUS;
- }
-
- if (extractSEIButton.getSelection() && seiInterfaceNameText.getText().trim().length() == 0) {
- SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.JAVA2WS_ENTER_SEI_NAME);
- } else if (extractSEIButton.getSelection() && NUMBER_OF_PUBLIC_METHODS > 0
- && NUMBER_OF_CHECKED_METHODS == 0) {
- SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.bind(
- CXFCreationUIMessages.JAVA2WS_SELECT_SEI_EXTRACTED_METHODS,
- startingPointType.getElementName()));
- } else if (extractSEIButton.getSelection() && seiInterfaceNameText.getText().trim().length() > 0
- && NUMBER_OF_PUBLIC_METHODS > 0 && NUMBER_OF_CHECKED_METHODS > 0) {
- SEI_SELECTION_STATUS = Status.OK_STATUS;
- }
-
- } else {
- SEI_SELECTION_STATUS = Status.OK_STATUS;
- JAVA_TYPE_NAME_STATUS = Status.OK_STATUS;
- JAVA_TYPE_EXISTS_STATUS = Status.OK_STATUS;
- }
- }
-
- private IStatus findMostSevere() {
- if (JAVA_TYPE_NAME_STATUS.matches(IStatus.ERROR)) {
- return JAVA_TYPE_NAME_STATUS;
- }
- if (JAVA_TYPE_EXISTS_STATUS.matches(IStatus.ERROR)) {
- return JAVA_TYPE_EXISTS_STATUS;
- }
- if (SEI_SELECTION_STATUS.matches(IStatus.ERROR)) {
- return SEI_SELECTION_STATUS;
- }
-
- if (SEI_SELECTION_STATUS.getSeverity() >= JAVA_TYPE_NAME_STATUS.getSeverity()) {
- return SEI_SELECTION_STATUS;
- }
-
- if (JAVA_TYPE_EXISTS_STATUS.getSeverity() >= JAVA_TYPE_NAME_STATUS.getSeverity()) {
- return JAVA_TYPE_EXISTS_STATUS;
- }
-
- return JAVA_TYPE_NAME_STATUS; }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidget.java
deleted file mode 100644
index 3e0531a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidget.java
+++ /dev/null
@@ -1,186 +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.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.WSDLUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSConfigWidget extends SimpleWidgetDataContributor {
- private IStatus WSDL_FILENAME_OK_STATUS = Status.OK_STATUS;
- private IStatus WSDL_FILENAME_ERROR_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.JAVA2WS_ENTER_VALID_WSDL_NAME);
-
- private Button generateClientButton;
- private Button generateServerButton;
- private Button generateWraperFaultBeansButton;
- private Button generateWSDLButton;
- private Combo soapBindingCombo;
- private Button createXSDImports;
- private Text wsdlFileText;
- private Java2WSDataModel model;
-
- public Java2WSConfigWidget() {
- }
-
- public void setJava2WSDataModel(Java2WSDataModel model) {
- this.model = model;
- }
-
- @Override
- public void internalize() {
- if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- generateClientButton.setSelection(model.isGenerateClient());
- generateServerButton.setSelection(model.isGenerateServer());
- generateWraperFaultBeansButton.setSelection(model.isGenerateWrapperFaultBeans());
- generateWSDLButton.setSelection(model.isGenerateWSDL());
- enableWSDLGroup(model.isGenerateWSDL());
- }
- if (model.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
- createXSDImports.setSelection(model.isGenerateXSDImports());
- }
-
- @Override
- public WidgetDataEvents addControls(Composite parent, final Listener statusListener) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(2, false);
- composite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- composite.setLayoutData(gridData);
-
- Group java2wsGroup = null;
- if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- // Frontend
-// Java2WSWidgetFactory.createFrontendLabel(composite);
-//
-// final Combo frontendCombo = Java2WSWidgetFactory.createFrontendCombo(composite, model);
-// gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-// frontendCombo.setLayoutData(gridData);
-
- // Java2WS Group
- java2wsGroup = new Group(composite, SWT.SHADOW_IN);
- java2wsGroup.setText(CXFCreationUIMessages.JAVA2WS_GROUP_LABEL);
- GridLayout java2wslayout = new GridLayout();
-
- java2wslayout.numColumns = 3;
-
- java2wslayout.marginHeight = 10;
- java2wsGroup.setLayout(java2wslayout);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- java2wsGroup.setLayoutData(gridData);
-
- // Gen Client
- generateClientButton = Java2WSWidgetFactory.createGenerateClientButton(java2wsGroup, model);
-
- // Gen Server
- generateServerButton = Java2WSWidgetFactory.createGenerateServerButton(java2wsGroup, model);
-
- // Gen Wrapper and Fault Bean
- generateWraperFaultBeansButton = Java2WSWidgetFactory.createGenerateWrapperFaultBeanButton(
- java2wsGroup, model);
-
- // Gen WSDL
- generateWSDLButton = Java2WSWidgetFactory.createGenerateWSDLButton(java2wsGroup, model);
- generateWSDLButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- enableWSDLGroup(generateWSDLButton.getSelection());
- }
- });
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 3;
- generateWSDLButton.setLayoutData(gridData);
- }
-
- Group wsdlGroup = new Group(java2wsGroup == null ? composite : java2wsGroup, SWT.SHADOW_ETCHED_IN);
- GridLayout wsdlGroupLayout = new GridLayout(2, false);
- wsdlGroup.setLayout(wsdlGroupLayout);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 3;
- wsdlGroup.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createWSDLFileNameLabel(wsdlGroup);
-
- wsdlFileText = Java2WSWidgetFactory.createWSDLFileNameText(wsdlGroup, model);
- wsdlFileText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- statusListener.handleEvent(null);
- }
- });
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdlFileText.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createSOAPBindingLabel(wsdlGroup);
-
- soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(wsdlGroup, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- soapBindingCombo.setLayoutData(gridData);
-
- createXSDImports = Java2WSWidgetFactory.createXSDImportsButton(wsdlGroup, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- createXSDImports.setLayoutData(gridData);
-
- enableWSDLGroup(model.isGenerateWSDL());
-
- return this;
- }
-
- private void enableWSDLGroup(boolean enable) {
- wsdlFileText.setEnabled(enable);
- soapBindingCombo.setEnabled(enable);
- createXSDImports.setEnabled(enable);
- }
-
- @Override
- public IStatus getStatus() {
- return getWSDLFileNameStatus();
- }
-
- private IStatus getWSDLFileNameStatus() {
- IStatus status = WSDL_FILENAME_OK_STATUS;
- String wsdlFileName = wsdlFileText.getText();
- if (!WSDLUtils.isValidWSDLFileName(wsdlFileName)) {
- status = WSDL_FILENAME_ERROR_STATUS;
- }
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidgetFactory.java
deleted file mode 100644
index 49dab35..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidgetFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private SimpleWidgetContributor java2WSWidgetContributor;
-
- private Java2WSConfigWidget java2WSConfigWidget = new Java2WSConfigWidget();
-
- public Java2WSConfigWidgetFactory() {
-
- }
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if (java2WSWidgetContributor == null) {
- init();
- }
- return java2WSWidgetContributor;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(Java2WSDefaultingCommand.class,
- "Java2WSDataModel", Java2WSConfigWidgetFactory.class); //$NON-NLS-1$
- }
-
- public void setJava2WSDataModel(Java2WSDataModel model) {
- java2WSConfigWidget.setJava2WSDataModel(model);
- }
-
- private void init() {
- java2WSWidgetContributor = new SimpleWidgetContributor();
- CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
- String title = CXFCreationUIMessages.bind(
- CXFCreationUIMessages.JAVA2WS_PAGE_TITLE, new Object[]{context.getCxfRuntimeEdition(),
- context.getCxfRuntimeVersion()});
-
- java2WSWidgetContributor.setTitle(title);
- java2WSWidgetContributor
- .setDescription(CXFCreationUIMessages.JAVA2WS_PAGE_DESCRIPTION);
- java2WSWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return java2WSConfigWidget;
- }
- });
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSInterfaceConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSInterfaceConfigWidget.java
deleted file mode 100644
index 8c00bad..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSInterfaceConfigWidget.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- *
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSInterfaceConfigWidget extends SimpleWidgetDataContributor {
- private Java2WSDataModel model;
- private IType startingPointType;
-
- public Java2WSInterfaceConfigWidget() {
- }
-
- public void setJava2WSDataModel(Java2WSDataModel model) {
- this.model = model;
- }
-
- public void setJavaStartingPointType(IType startingPointType) {
- this.startingPointType = startingPointType;
- }
-
- @Override
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- final Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(2, false);
- composite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- composite.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createSelectImplementationLabel(composite);
-
- Combo selectImplementationCombo = Java2WSWidgetFactory
- .createSelectImplementationCombo(composite, model, startingPointType);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- selectImplementationCombo.setLayoutData(gridData);
- /*
- CLabel underConstructionLabel = new CLabel(composite, SWT.NONE);
- gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
- underConstructionLabel.setLayoutData(gridData);
- underConstructionLabel.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(
- ISharedImages.IMG_OBJS_INFO_TSK));
- underConstructionLabel.setText("Under Construction");
- */
- return this;
- }
-
- @Override
- public IStatus getStatus() {
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSSelectSEIWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSSelectSEIWidgetFactory.java
deleted file mode 100644
index c217069..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSSelectSEIWidgetFactory.java
+++ /dev/null
@@ -1,112 +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.creation.ui.widgets;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-/**
- *
- * @author sclarke
- *
- */
-@SuppressWarnings("restriction")
-public class Java2WSSelectSEIWidgetFactory implements INamedWidgetContributorFactory {
- private SimpleWidgetContributor classWidgetContributor;
- private SimpleWidgetContributor interfaceWidgetContributor;
-
- private Java2WSClassConfigWidget java2WSClassConfigWidget = new Java2WSClassConfigWidget();
- private Java2WSInterfaceConfigWidget java2WSInterfaceConfigWidget = new Java2WSInterfaceConfigWidget();
-
- private IType startingPointType;
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if (interfaceWidgetContributor == null || classWidgetContributor == null) {
- init();
- }
-
- try {
- if (startingPointType.isInterface()) {
- return interfaceWidgetContributor;
- } else if (startingPointType.isClass()) {
- return classWidgetContributor;
- }
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
-
- return null;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(Java2WSDefaultingCommand.class,
- "Java2WSDataModel", Java2WSSelectSEIWidgetFactory.class); //$NON-NLS-1$
- dataRegistry.addMapping(Java2WSDefaultingCommand.class,
- "JavaStartingPointType", Java2WSSelectSEIWidgetFactory.class); //$NON-NLS-1$
- }
-
- public void setJava2WSDataModel(Java2WSDataModel model) {
- java2WSClassConfigWidget.setJava2WSDataModel(model);
- java2WSInterfaceConfigWidget.setJava2WSDataModel(model);
- }
-
- public void setJavaStartingPointType(IType startingPointType) {
- this.startingPointType = startingPointType;
- java2WSClassConfigWidget.setJavaStartingPointType(startingPointType);
- java2WSInterfaceConfigWidget.setJavaStartingPointType(startingPointType);
- }
-
- private void init() {
- classWidgetContributor = new SimpleWidgetContributor();
- CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
- String classConfigTitle = CXFCreationUIMessages.bind(
- CXFCreationUIMessages.JAVA2WS_CLASS_CONFIG_PAGE_TITLE,
- new Object[]{context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
- classWidgetContributor.setTitle(classConfigTitle);
- classWidgetContributor
- .setDescription(CXFCreationUIMessages.JAVA2WS_CLASS_CONFIG_PAGE_DESCRIPTION);
- classWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return java2WSClassConfigWidget;
- }
- });
-
- interfaceWidgetContributor = new SimpleWidgetContributor();
- String interfaceConfigTitle = CXFCreationUIMessages.bind(
- CXFCreationUIMessages.JAVA2WS_INTERFACE_CONFIG_PAGE_TITLE,
- new Object[]{context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
- interfaceWidgetContributor.setTitle(interfaceConfigTitle);
- interfaceWidgetContributor
- .setDescription(CXFCreationUIMessages.JAVA2WS_INTERFACE_CONFIG_PAGE_DESCRIPTION);
- interfaceWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return java2WSInterfaceConfigWidget;
- }
- });
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidget.java
deleted file mode 100644
index 734f6cc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidget.java
+++ /dev/null
@@ -1,311 +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.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameEditingSupport;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameTableContentProvider;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaConfigWidget extends SimpleWidgetDataContributor {
- private IStatus status = Status.OK_STATUS;
- private Composite parent;
- private Listener statusListener;
-
- private WSDL2JavaDataModel model;
-
- private Combo outputDirCombo;
- private Text packageNameText;
- private Button namespaceMappingButton;
- private TableViewer packageNameTableViewer;
- private Combo serviceNameCombo;
- private List bindingFilesList;
-
- private Composite namespaceCompositeHolder;
- private Composite namespaceComposite;
- private int namespaceCompositeHeight = -1;
-
- public WSDL2JavaConfigWidget() {
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public void internalize() {
- WSDL2JavaWidgetFactory.populateOutputDirectoryCombo(outputDirCombo, model.getProjectName());
- packageNameText.setText(model.getIncludedNamespaces().get(model.getTargetNamespace()));
- namespaceMappingButton.setSelection(false);
- expandNamespaceComposite(false);
- if (packageNameTableViewer != null && packageNameTableViewer.getContentProvider() != null) {
- packageNameTableViewer.setInput(model.getWsdlDefinition());
- }
- WSDL2JavaWidgetFactory.populateServiceNameCombo(serviceNameCombo, model);
-
- bindingFilesList.removeAll();
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- this.parent = parent;
- this.statusListener = statusListener;
-
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(3, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- // Output Dir
- WSDL2JavaWidgetFactory.createOutputDirectoryLabel(mainComposite);
-
- outputDirCombo = WSDL2JavaWidgetFactory.createOutputDirectoryCombo(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- outputDirCombo.setLayoutData(gridData);
-
- // Package Name:
- WSDL2JavaWidgetFactory.createPackageNameLabel(mainComposite);
-
- packageNameText = WSDL2JavaWidgetFactory.createPackageNameText(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- packageNameText.setLayoutData(gridData);
-
- packageNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String packageName = packageNameText.getText();
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName);
- statusListener.handleEvent(null);
- }
- });
-
- namespaceMappingButton = WSDL2JavaWidgetFactory
- .createNamespacePackageMappingButton(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 3;
- namespaceMappingButton.setLayoutData(gridData);
- namespaceMappingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- expandNamespaceComposite(namespaceMappingButton.getSelection());
- }
- });
-
- namespaceCompositeHolder = new Composite(mainComposite, SWT.NONE);
- gridLayout = new GridLayout(1, true);
- namespaceCompositeHolder.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- namespaceCompositeHolder.setLayoutData(gridData);
-
- // Service Name:
- WSDL2JavaWidgetFactory.createServiceNameLabel(mainComposite);
-
- serviceNameCombo = WSDL2JavaWidgetFactory.createServiceNameCombo(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- serviceNameCombo.setLayoutData(gridData);
-
- Label bindingFilesLabel = WSDL2JavaWidgetFactory.createBindingFilesLabel(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.verticalSpan = 3;
- bindingFilesLabel.setLayoutData(gridData);
-
- bindingFilesList = WSDL2JavaWidgetFactory.createBindingFilesList(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.verticalSpan = 3;
- bindingFilesList.setLayoutData(gridData);
-
- Button addBindingFileButton = WSDL2JavaWidgetFactory.createAddBindingFileButton(mainComposite, model,
- bindingFilesList);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- addBindingFileButton.setLayoutData(gridData);
-
- Button removeBindingFileButton = WSDL2JavaWidgetFactory.createRemoveBindingFileButton(mainComposite,
- model, bindingFilesList);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- removeBindingFileButton.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createPaddingLabel(mainComposite);
-
- /*
- WSDL2JavaWidgetFactory.createXMLCatalogLabel(mainComposite);
-
- Text xmlCatalogText = WSDL2JavaWidgetFactory.createXMLCatalogText(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xmlCatalogText.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createXMLCatalogBrowseButton(mainComposite);
- */
- return this;
- }
-
- private void expandNamespaceComposite(boolean expand) {
- if (expand) {
- if (namespaceComposite == null) {
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 7;
- namespaceCompositeHolder.setLayoutData(gridData);
- namespaceCompositeHolder.pack();
-
- namespaceComposite = getNamespaceMappingComposite(namespaceCompositeHolder);
- if (namespaceCompositeHeight == -1) {
- Point groupSize = namespaceComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
- namespaceCompositeHeight = groupSize.y;
- }
- Shell shell = parent.getShell();
- Point shellSize = shell.getSize();
- shell.setSize(shellSize.x, shellSize.y + namespaceCompositeHeight);
-
- namespaceCompositeHolder.layout();
- }
- } else {
- if (namespaceComposite != null) {
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- namespaceCompositeHolder.setLayoutData(gridData);
- namespaceCompositeHolder.pack();
- namespaceComposite.dispose();
- namespaceComposite = null;
- namespaceCompositeHolder.layout();
- Shell shell = parent.getShell();
- Point shellSize = shell.getSize();
- shell.setSize(shellSize.x, shellSize.y - namespaceCompositeHeight);
- }
- }
- }
-
- private Composite getNamespaceMappingComposite(Composite parent) {
- namespaceComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, true);
- namespaceComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- namespaceComposite.setLayoutData(gridData);
-
- Table packageNameTable = createNamespaceMappingTable(namespaceComposite);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- packageNameTable.setLayoutData(gridData);
-
- return namespaceComposite;
- }
-
- private Table createNamespaceMappingTable(Composite parent) {
- packageNameTableViewer = new TableViewer(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER
- | SWT.FULL_SELECTION);
-
- Table packageNameTable = packageNameTableViewer.getTable();
- packageNameTable.setLinesVisible(true);
- packageNameTable.setHeaderVisible(true);
-
- TableLayout tableLayout = new TableLayout();
- packageNameTable.setLayout(tableLayout);
-
- WSDL2JavaWidgetFactory.createWSDLNamespaceViewerColumn(packageNameTableViewer);
-
- ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- TableViewerColumn packageNameViewerColumn = WSDL2JavaWidgetFactory.createPackageNameColumn(
- packageNameTableViewer, model);
-
- packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
- new PackageNameTextCellEditor(packageNameTableViewer.getTable()), model));
-
- columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- packageNameTableViewer.setContentProvider(new PackageNameTableContentProvider());
- packageNameTableViewer.setInput(model.getWsdlDefinition());
-
- TableItem[] tableItems = packageNameTable.getItems();
- for (int i = 0; i < tableItems.length; i++) {
- TableItem tableItem = tableItems[i];
- if (model.getIncludedNamespaces().containsKey(tableItem.getText(0))) {
- tableItem.setChecked(true);
- }
- }
- return packageNameTable;
- }
-
- @Override
- public IStatus getStatus() {
- return status;
- }
-
- private class PackageNameTextCellEditor extends TextCellEditor implements ICellEditorListener,
- ICellEditorValidator {
-
- public PackageNameTextCellEditor(Composite parent) {
- super(parent);
- addListener(this);
- setValidator(this);
- }
-
- public void applyEditorValue() {
- }
-
- public void cancelEditor() {
- }
-
- public void editorValueChanged(boolean oldValidState, boolean newValidState) {
- statusListener.handleEvent(null);
- }
-
- public String isValid(Object packageName) {
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
- if (status.getSeverity() == IStatus.OK) {
- return null;
- }
- return status.getMessage();
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidgetFactory.java
deleted file mode 100644
index dea3210..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidgetFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private SimpleWidgetContributor wsdl2JavaWidgetContributor;
- private SimpleWidgetContributor wsdl2JavaDefaultsWidgetContributor;
-
- private WSDL2JavaConfigWidget wsdl2JavaConfigWidget = new WSDL2JavaConfigWidget();
- private WSDL2JavaDefaultsConfigWidget wsdl2JavaDefaultsConfigWidget = new WSDL2JavaDefaultsConfigWidget();
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if ((wsdl2JavaWidgetContributor == null || wsdl2JavaDefaultsWidgetContributor == null)) {
- init();
- }
- return wsdl2JavaWidgetContributor;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- if (widgetContributor == wsdl2JavaWidgetContributor) {
- return wsdl2JavaDefaultsWidgetContributor;
- }
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(WSDL2JavaDefaultingCommand.class,
- "WSDL2JavaDataModel", WSDL2JavaConfigWidgetFactory.class); //$NON-NLS-1$
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- wsdl2JavaConfigWidget.setWSDL2JavaDataModel(model);
- wsdl2JavaDefaultsConfigWidget.setWSDL2JavaDataModel(model);
- }
-
- private void init() {
- wsdl2JavaWidgetContributor = new SimpleWidgetContributor();
- CXFContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- String wsdl2JavaPageTitle = CXFCreationUIMessages.bind(
- CXFCreationUIMessages.WSDL2JAVA_PAGE_TITLE, new Object[]{context.getCxfRuntimeEdition(),
- context.getCxfRuntimeVersion()});
- wsdl2JavaWidgetContributor.setTitle(wsdl2JavaPageTitle);
- wsdl2JavaWidgetContributor
- .setDescription(CXFCreationUIMessages.WSDL2JAVA_PAGE_DESCRIPTION);
- wsdl2JavaWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaConfigWidget;
- }
- });
-
- wsdl2JavaDefaultsWidgetContributor = new SimpleWidgetContributor();
- String wsdl2JavaDefaultsPageTitle = CXFCreationUIMessages.bind(
- CXFCreationUIMessages.WSDL2JAVA_DEFAULTS_PAGE_TITLE, new Object[]{
- context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
- wsdl2JavaDefaultsWidgetContributor.setTitle(wsdl2JavaDefaultsPageTitle);
- wsdl2JavaDefaultsWidgetContributor
- .setDescription(CXFCreationUIMessages.WSDL2JAVA_DEFAULTS_PAGE_DESCRIPTION);
- wsdl2JavaDefaultsWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaDefaultsConfigWidget;
- }
- });
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaDefaultsConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaDefaultsConfigWidget.java
deleted file mode 100644
index c0d8ab8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaDefaultsConfigWidget.java
+++ /dev/null
@@ -1,100 +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.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaDefaultsConfigWidget extends SimpleWidgetDataContributor {
- private WSDL2JavaDataModel model;
-
- public WSDL2JavaDefaultsConfigWidget() {
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(mainComposite, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFCreationUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(1, true);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, model);
- WSDL2JavaWidgetFactory.createGenerateImplementationButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(wsdl2javaGroup, model);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, model);
- }
-
- if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, model);
- }
-
- Group xjcArgGroup = new Group(mainComposite, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFCreationUIMessages.WSDL2JAVA_XJC_ARG_GROUP_LABEL);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- Table xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable, model);
-
- return this;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaProjectSelectionWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaProjectSelectionWidgetFactory.java
deleted file mode 100644
index 1d2df91..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaProjectSelectionWidgetFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaProjectSelectionCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-
-/**
- * This is stop gap workaround for bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243286">#243286</a>
- * and <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243290">#243290</a>
- * <p>
- * Used in conjunction with <code>WSDL2JavaProjectSelectionCommand</code>
- *
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaProjectSelectionWidgetFactory implements INamedWidgetContributorFactory {
-
- public INamedWidgetContributor getFirstNamedWidget() {
- return null;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", //$NON-NLS-1$
- WSDL2JavaProjectSelectionCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", //$NON-NLS-1$
- WSDL2JavaProjectSelectionCommand.class, "ServerProject", new StringToIProjectTransformer()); //$NON-NLS-1$
- dataRegistry.addMapping(ServerWizardWidget.class, "Project", WSDL2JavaProjectSelectionCommand.class); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java
deleted file mode 100644
index 4e7f9cd..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java
+++ /dev/null
@@ -1,116 +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.creation.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.CXFDeployCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.JAXWSAnnotateJavaCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSSelectSEICommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaProjectSelectionCommand;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class CXFWebService extends AbstractWebService {
-
- public CXFWebService(WebServiceInfo info) {
- super(info);
- }
-
- @Override
- public ICommandFactory assemble(IEnvironment environment, IContext ctx, ISelection selection,
- String projectName, String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory deploy(IEnvironment environment, IContext ctx, ISelection selection,
- String projectName, String earProject) {
- return null;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ICommandFactory develop(IEnvironment environment, IContext ctx, ISelection selection,
- String projectName, String earProject) {
- Vector commands = new Vector();
-
- EclipseEnvironment eclipseEnvironment = (EclipseEnvironment) environment;
- registerDataMappings(eclipseEnvironment.getCommandManager().getMappingRegistry());
-
- if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
- Java2WSDataModel java2WSDataModel = CXFFactory.eINSTANCE.createJava2WSDataModel();
- java2WSDataModel.setProjectName(projectName);
- java2WSDataModel.setJavaStartingPoint(this.getWebServiceInfo().getImplURL());
- commands.add(new Java2WSDefaultingCommand(java2WSDataModel));
- commands.add(new Java2WSSelectSEICommand(java2WSDataModel));
- commands.add(new JAXWSAnnotateJavaCommand(java2WSDataModel));
- commands.add(new Java2WSCommand(java2WSDataModel));
- } else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
- WSDL2JavaDataModel wsdl2JavaDataModel = CXFFactory.eINSTANCE.createWSDL2JavaDataModel();
- commands.add(new WSDL2JavaProjectSelectionCommand(wsdl2JavaDataModel));
- commands.add(new WSDL2JavaDefaultingCommand(wsdl2JavaDataModel, projectName,
- getWebServiceInfo().getWsdlURL()));
- commands.add(new WSDL2JavaCommand(wsdl2JavaDataModel, this));
- } else {
- return null;
- }
-
- return new SimpleCommandFactory(commands);
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(Java2WSCommand.class, "CXFDataModel", CXFDeployCommand.class); //$NON-NLS-1$
- dataRegistry.addMapping(WSDL2JavaCommand.class, "CXFDataModel", CXFDeployCommand.class); //$NON-NLS-1$
- dataRegistry.addMapping(CXFDeployCommand.class, "ClientComponentType", //$NON-NLS-1$
- ClientExtensionDefaultingCommand.class);
- }
-
- @Override
- public ICommandFactory install(IEnvironment environment, IContext ctx, ISelection selection,
- String projectName, String earProject) {
- return null;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ICommandFactory run(IEnvironment environment, IContext ctx, ISelection selection,
- String projectName, String earProject) {
- Vector commands = new Vector();
- commands.add(new CXFDeployCommand(projectName, this));
- return new SimpleCommandFactory(commands);
- }
-
- @Override
- public WebServiceInfo getWebServiceInfo() {
- return super.getWebServiceInfo();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebServiceRuntime.java
deleted file mode 100644
index 1b27240..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebServiceRuntime.java
+++ /dev/null
@@ -1,35 +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.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt.CXFWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class CXFWebServiceRuntime extends AbstractWebServiceRuntime {
-
- @Override
- public IWebService getWebService(WebServiceInfo info) {
- return new CXFWebService(info);
- }
-
- @Override
- public IWebServiceClient getWebServiceClient(WebServiceClientInfo info) {
- return new CXFWebServiceClient(info);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.ui/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/.project b/bundles/org.eclipse.jst.ws.cxf.ui/.project
deleted file mode 100644
index 160341a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8cadd13..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:55 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 81237eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.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.cxf.ui;singleton:=true
-Bundle-Version: 0.3.5.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.ui,org.eclipse.jst.ws.internal.cxf.ui.dialogs,org.eclipse.jst.ws.internal.cxf.ui.viewers,org.eclipse.jst.ws.internal.cxf.ui.widgets
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.jdt.core,
- javax.wsdl,
- org.eclipse.jdt.ui,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.emf.ecore,
- 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.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.ui/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- .,\
- plugin.properties,\
- plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.ui/plugin.properties
deleted file mode 100644
index 8f42f0e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services UI (Incubation)
-pluginProvider=Eclipse.org
-PREFERENCE_CATEGORY_CXF_RUNTIME=CXF 2.x Preferences
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml
deleted file mode 100644
index 23db738..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.cxf.ui.preferences.CXFRuntimePreferencePage"
- id="org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage"
- name="%PREFERENCE_CATEGORY_CXF_RUNTIME">
- </page>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java
deleted file mode 100644
index 481d638..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author sclarke
- */
-public class CXFUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.cxf.ui.CXFUImessages"; //$NON-NLS-1$
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSON_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER;
-
- public static String JAVA2WS_PREFERENCES_TAB_NAME;
- public static String JAVA2WS_PREFERENCES_TAB_TOOLTIP;
-
- public static String JAVA2WSDL_PREFERENCES_TAB_NAME;
- public static String JAVA2WSDL_PREFERENCES_TAB_TOOLTIP;
-
- public static String ANNOTATIONS_PREFERENCES_TAB_NAME;
- public static String ANNOTATIONS_PREFERENCES_TAB_TOOLTIP;
-
- public static String WSDL2JAVA_PREFERENCES_TAB_NAME;
- public static String WSDL2JAVA_PREFERENCES_TAB_TOOLTIP;
-
- public static String SPRING_CONFIG_PREFERENCES_TAB_NAME;
- public static String SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP;
-
- public static String ANNOTATIONS_PREFERENCES_LINK;
-
- public static String CXF_DEFAULT_FRONTEND_LABEL;
- public static String CXF_DEFAULT_DATABINDING_LABEL;
- public static String JAVA2WS_GROUP_LABEL;
- public static String JAVA2WSDL_GROUP_LABEL;
- public static String WSDL2JAVA_GROUP_LABEL;
- public static String JAVA2WS_GEN_CLIENT_LABEL;
- public static String JAVA2WS_GEN_SERVER_LABEL;
- public static String JAVA2WS_GEN_IMPLEMENTATION_LABEL;
- public static String JAVA2WS_GEN_WRAPPER_FAULT_LABEL;
- public static String JAVA2WS_GEN_WSDL_LABEL;
- public static String JAVA2WS_DEFAULT_SOAPBINDING_LABEL;
- public static String JAVA2WS_GEN_XSD_IMPORTS;
- public static String CXF_INVALID_VERSION_FORMAT;
- public static String CXF_VERSION_NOT_SPECIFIED;
- public static String SPRING_CONFIG_GROUP_LABEL;
- public static String SPRING_CONFIG_USE_CXF_SERVLET;
- public static String SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT;
- public static String WSDL2JAVA_PROCESS_SOAP_HEADERS;
- public static String WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING;
- public static String WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING;
- public static String WSDL2JAVA_WSDL_VERSION_LABEL;
- public static String WSDL2JAVA_USE_DEFAULT_VALUES;
-
- public static String JAXWS_ANNOTATIONS_GROUP_LABEL;
- public static String JAXWS_ANNOTATIONS_GROUP_TOOLTIP;
- public static String JAXWS_GENERATE_WEB_METHOD;
- public static String JAXWS_GENERATE_WEB_PARAM;
- public static String JAXWS_GENERATE_REQUEST_WRAPPER;
- public static String JAXWS_GENERATE_RESPONSE_WRAPPER;
- public static String JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL;
- public static String JAXWS_ENABLE_ANNOTATION_PROCESSING;
- public static String JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP;
-
- public static String JAVA2WS_SOAP12_BINDING_TOOLTIP;
- public static String JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP;
- public static String JAVA2WS_DATABINDING_TOOLTIP;
- public static String JAVA2WS_FRONTEND_TOOLTIP;
- public static String JAVA2WS_GENERATE_WSDL_TOOLTIP;
- public static String JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP;
- public static String JAVA2WS_GENERATE_CLIENT_TOOLTIP;
- public static String JAVA2WS_GENERATE_SERVER_TOOLTIP;
- public static String JAVA2WS_GENERATE_ANT_TOOLTIP;
- public static String JAVA2WS_BEANS_TOOLTIP;
- public static String JAVA2WS_TARGET_NAMESPACE_TOOLTIP;
- public static String JAVA2WS_SERVICE_NAME_TOOLTIP;
- public static String JAVA2WS_PORT_NAME_TOOLTIP;
- public static String JAVA2WS_ADDRESS_TOOLTIP;
-
- public static String JAVA2WS_WSDL_FILE_NAME;
- public static String JAVA2WS_OUTPUT_FILE_TOOLTIP;
-
- public static String JAVA2WS_USE_SEI_BUTTON;
- public static String JAVA2WS_USE_SEI_INFO_LABEL;
-
- public static String JAVA2WS_SELECT_SEI;
- public static String JAVA2WS_SELECT_SEI_LABEL;
- public static String JAVA2WS_SELECT_SEI_TOOLTIP;
- public static String JAVA2WS_EXTRACT_SEI;
- public static String JAVA2WS_EXTRACT_SEI_LABEL;
- public static String JAVA2WS_EXTRACT_SEI_TOOLTIP;
- public static String JAVA2WS_EXTRACT_MEMBERS_LABEL;
-
- public static String JAVA2WS_SELECT_ALL_BUTTON;
- public static String JAVA2WS_DESELECT_ALL_BUTTON;
-
- public static String JAVA2WS_SELECT_IMPLEMENTATION;
- public static String JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP;
-
- public static String WSDL2JAVA_FRONTEND_TOOLTIP;
- public static String WSDL2JAVA_DATABINDING_TOOLTIP;
- public static String WSDL2JAVA_WSDL_VERSION_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_CLIENT_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_SERVER_TOOLTIP;
- public static String WSDL2JAVA_DEFAULT_VALUES_TOOLTIP;
- public static String WSDL2JAVA_EXCLUDE_NAMESPACE_TOOLTIP;
- public static String WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP;
- public static String WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP;
- public static String WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP;
- public static String WSDL2JAVA_WSDL_LOCATION_TOOLTIP;
- public static String WSDL2JAVA_NO_ADDRESS_BINDING;
- public static String WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP;
- public static String WSDL2JAVA_AUTO_NAME_RESOLUTION;
- public static String WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP;
- public static String WSDL2JAVA_XML_CATALOG_TOOLTIP;
- public static String WSDL2JAVA_XJC_ARGS_TOOLTIP;
- public static String WSDL2JAVA_XJC_ARG_GROUP_TITLE;
- public static String WSDL2JAVA_XJC_ARG_COLUMN_NAME;
- public static String WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME;
- public static String WSDL2JAVA_XJC_DEFAULT_VALUES;
- public static String WSDL2JAVA_XJC_TOSTRING;
- public static String WSDL2JAVA_XJC_TOSTRING_MULTILINE;
- public static String WSDL2JAVA_XJC_TOSTRING_SIMPLE;
- public static String WSDL2JAVA_XJC_LOCATOR;
- public static String WSDL2JAVA_XJC_SYNC_METHODS;
- public static String WSDL2JAVA_XJC_MARK_GENERATED;
- public static String WSDL2JAVA_XJC_EPISODE_FILE;
-
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON;
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON;
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR;
-
- public static String WSDL2JAVA_OUTPUT_DIRECTORY;
- public static String WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP;
-
- public static String WSDL2JAVA_PACKAGE_NAME;
- public static String WSDL2JAVA_PACKAGE_NAME_TOOLTIP;
-
- public static String WSDL2JAVA_PACKAGE_NAME_OPTIONAL;
- public static String WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP;
-
- public static String WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER;
- public static String WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER;
-
- public static String WSDL2JAVA_SERVICE_NAME;
- public static String WSDL2JAVA_SERVICE_NAME_TOOLTIP;
-
- public static String WSDL2JAVA_BINDING_FILES;
- public static String WSDL2JAVA_BINDING_NAME_TOOLTIP;
- public static String WSDL2JAVA_BINDING_FILES_ADD;
- public static String WSDL2JAVA_BINDING_FILES_REMOVE;
-
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_TITLE;
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE;
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME;
-
- public static String WSDL2JAVA_XML_CATLOG;
- public static String WSDL2JAVA_XML_CATLOG_TOOLTIP;
- public static String WSDL2JAVA_XML_CATLOG_BROWSE;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, CXFUIMessages.class);
- }
-
- private CXFUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
deleted file mode 100644
index 6d36e0a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- * @author sclarke
- */
-public class CXFUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFUIPlugin plugin;
-
- /**
- * The constructor
- */
- public CXFUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static CXFUIPlugin getDefault() {
- return plugin;
- }
-
- public static void logMessage(int severity, String message) {
- CXFUIPlugin.log(new Status(severity, CXFUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFUIPlugin.log(new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
- exception.getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties
deleted file mode 100644
index 8f68d44..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties
+++ /dev/null
@@ -1,166 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-#CXF Preference Pages
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME=&CXF Runtime
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP=Browse and select CXF Binary distribution folder
-CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL=CXF &Home:
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET=Missing CXF jar: Please select the CXF home directory.
-CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL=&Browse...
-CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSON_LABEL=Version:
-CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER=Export runtime libraries to WEB-INF/lib at deployment time
-
-JAVA2WSDL_PREFERENCES_TAB_NAME=Java2WSDL
-JAVA2WSDL_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the Java2WSDL tool
-
-JAVA2WS_PREFERENCES_TAB_NAME=&Java2WS
-JAVA2WS_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the Java2WS tool
-
-ANNOTATIONS_PREFERENCES_LINK=See the <A>'JAX-WS'</A> tab for the annotation preferences.
-
-ANNOTATIONS_PREFERENCES_TAB_NAME=JA&X-WS
-ANNOTATIONS_PREFERENCES_TAB_TOOLTIP=Please select the JAX-WS annotations that are generated by default on the class or interface before input to Java2WS
-
-WSDL2JAVA_PREFERENCES_TAB_NAME=&WSDL2Java
-WSDL2JAVA_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the WSDL2Java tool
-
-SPRING_CONFIG_PREFERENCES_TAB_NAME=&Spring Config
-SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP=Please select the default option for Spring configuration generation
-SPRING_CONFIG_USE_CXF_SERVLET=Use CX&F Servlet
-SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT=Use Spring &Application Context
-
-CXF_DEFAULT_FRONTEND_LABEL=Default &Frontend:
-CXF_DEFAULT_DATABINDING_LABEL=Default &Databindng:
-JAVA2WS_GROUP_LABEL=Java2WS Generation Options:
-JAVA2WSDL_GROUP_LABEL=Java2WSDL Generation Options:
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options:
-JAVA2WS_GEN_CLIENT_LABEL=Generate Cli&ent
-JAVA2WS_GEN_SERVER_LABEL=Generate Ser&ver
-JAVA2WS_GEN_IMPLEMENTATION_LABEL=Generate &Implementation
-JAVA2WS_GEN_WRAPPER_FAULT_LABEL=Generate Wrapper and Fault &Beans
-JAVA2WS_GEN_WSDL_LABEL=Generate WSD&L
-JAVA2WS_DEFAULT_SOAPBINDING_LABEL=Default S&OAP Binding:
-JAVA2WS_GEN_XSD_IMPORTS=Generate separate XSD for the &types
-CXF_INVALID_VERSION_FORMAT=Invalid Version Format
-CXF_VERSION_NOT_SPECIFIED=CXF version value not specified
-SPRING_CONFIG_GROUP_LABEL=CXF Endpoint Configuration Options:
-WSDL2JAVA_PROCESS_SOAP_HEADERS=Enable &processing of implicit SOAP headers
-WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING=Enable &loading of the default namespace package name mapping
-WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING=Enable the use of the default &excludes namespace mapping
-WSDL2JAVA_WSDL_VERSION_LABEL=WSDL Version:
-WSDL2JAVA_USE_DEFAULT_VALUES=Generate &default values for the generated artifacts
-
-JAXWS_ANNOTATIONS_GROUP_LABEL=JAX-WS Annotation Generation
-JAXWS_ANNOTATIONS_GROUP_TOOLTIP=Select the annotations which are generated by default on the class or interface before input to Java2WS
-JAXWS_GENERATE_WEB_METHOD=@Web&Method
-JAXWS_GENERATE_WEB_PARAM=@Web&Param
-JAXWS_GENERATE_REQUEST_WRAPPER=@Re&questWrapper
-JAXWS_GENERATE_RESPONSE_WRAPPER=@&ResponseWrapper
-JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL=JAX-WS Annotation Processing
-JAXWS_ENABLE_ANNOTATION_PROCESSING=&Enable annotation validation processing
-JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP=Turn JAX-WS annotation processing on or off in projects configured for {0} web services.
-
-JAVA2WS_SOAP12_BINDING_TOOLTIP=Specify to generate SOAP 1.2 binding
-JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP= Output schemas to separate files and use imports to load them instead of inlining them into the wsdl.
-JAVA2WS_DATABINDING_TOOLTIP= Specify the data binding. Default is jaxb for jaxws frontend.
-#JAVA2WS_DATABINDING_TOOLTIP= Specify the data binding (aegis or jaxb). Default is jaxb for jaxws frontend, and aegis for simple frontend.
-JAVA2WS_FRONTEND_TOOLTIP=Specify the frontend to use.
-#JAVA2WS_FRONTEND_TOOLTIP=Specify the frontend to use. jaxws and the simple frontend are supported.
-JAVA2WS_GENERATE_WSDL_TOOLTIP=Specify to generate the WSDL file
-JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP=Specify to generate the wrapper and fault bean
-JAVA2WS_GENERATE_CLIENT_TOOLTIP=Generate a client mainline using JAX-WS APIs\n.....\n javax.xml.ws.Service service = javax.xml.ws.Service.create(...);\n... client = service.getPort(...);\n
-JAVA2WS_GENERATE_SERVER_TOOLTIP=Generate a server mainline using JAX-WS APIs\n.....\n javax.xml.ws.Endpoint.publish(...);\n.....\n
-JAVA2WS_GENERATE_ANT_TOOLTIP=Specify to generate an Ant build.xml file
-JAVA2WS_BEANS_TOOLTIP=Specify the pathname of a file defining additional Spring beans to customise data binding configuration.
-JAVA2WS_TARGET_NAMESPACE_TOOLTIP=Specify the target namespace to use in the wsdl
-JAVA2WS_SERVICE_NAME_TOOLTIP=Specify the service name to use in the generated wsdl
-JAVA2WS_PORT_NAME_TOOLTIP=Specify the port name to use in the generated wsdl
-JAVA2WS_ADDRESS_TOOLTIP= Specify the port address
-
-JAVA2WS_WSDL_FILE_NAME=&WSDL File:
-JAVA2WS_OUTPUT_FILE_TOOLTIP=Specify the output wsdl file name
-
-JAVA2WS_USE_SEI_BUTTON=&Use a Service Endpoint Interface:
-JAVA2WS_USE_SEI_INFO_LABEL=(You may work directly with the {0} Java class. But working from an interface is the recommended approach. Two options are provided here.)
-JAVA2WS_SELECT_SEI=Select SEI:
-JAVA2WS_SELECT_SEI_LABEL=Select SEI from &Type Hierarchy:
-JAVA2WS_SELECT_SEI_TOOLTIP=Select the Interface from the Type Hierarchy to use as the SEI
-JAVA2WS_EXTRACT_SEI=Extract SEI:
-JAVA2WS_EXTRACT_SEI_LABEL=&Extract an SEI:
-JAVA2WS_EXTRACT_SEI_TOOLTIP=Type the name of the Service Endpoint Interface to extract
-JAVA2WS_EXTRACT_MEMBERS_LABEL=Members to declare in the extracted SEI:
-JAVA2WS_SELECT_ALL_BUTTON=&Select All...
-JAVA2WS_DESELECT_ALL_BUTTON=&Deselect All...
-JAVA2WS_SELECT_IMPLEMENTATION=Select &Implementation:
-JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP=Select the Implementation
-
-WSDL2JAVA_FRONTEND_TOOLTIP=Specify the frontend. Default is JAXWS. Currently supports only JAXWS frontend
-WSDL2JAVA_DATABINDING_TOOLTIP=Specify the databinding. Default is JAXB. Currently supports only JAXB databinding.
-WSDL2JAVA_WSDL_VERSION_TOOLTIP=Specify the wsdl version .Default is WSDL1.1. Currently suppports only WSDL1.1 version
-WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP=Generate starting point code for an implementation object
-WSDL2JAVA_GENERATE_CLIENT_TOOLTIP=Generate the client code
-WSDL2JAVA_GENERATE_SERVER_TOOLTIP=Generate the server code
-WSDL2JAVA_DEFAULT_VALUES_TOOLTIP=Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-WSDL2JAVA_EXCLUDE_NAMESPACE_TOOLTIP=Ignore the specified WSDL schema namespaces when generating code
-WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP=Enables or disables processing of extended soap header message binding
-WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP=Enables or disables loading of the default namespace package name mapping
-WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP=Enables or disables loading of the default excludes namespace mapping
-WSDL2JAVA_WSDL_LOCATION_TOOLTIP=Specifies the value of the @WebService annotation's wsdlLocation property
-WSDL2JAVA_XML_CATALOG_TOOLTIP=Specify the URL of an XML catalog to use for resolving imported schemas and WSDL documents.
-WSDL2JAVA_NO_ADDRESS_BINDING=Use the {0} proprietary WS-&Addressing type
-WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP=Use the {0} proprietary WS-Addressing type instead of the JAX-WS 2.1 compliant mapping.
-WSDL2JAVA_AUTO_NAME_RESOLUTION=Enable Auto Name Resolution
-WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP=Automatically resolve naming conflicts without requiring the use of binding customizations.
-WSDL2JAVA_XJC_ARGS_TOOLTIP=Specify the arguments to be passed to directly to the XJC
-WSDL2JAVA_XJC_ARG_GROUP_TITLE=XJC Arguments
-WSDL2JAVA_XJC_ARG_COLUMN_NAME=XJC Arg
-WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME=Description
-WSDL2JAVA_XJC_DEFAULT_VALUES=Initialise fields mapped from elements with their default values
-WSDL2JAVA_XJC_TOSTRING=Activate plugin to add a toString() method to generated classes
-WSDL2JAVA_XJC_TOSTRING_MULTILINE=Have toString produce multi line output
-WSDL2JAVA_XJC_TOSTRING_SIMPLE=Have toString produce single line terse output
-WSDL2JAVA_XJC_LOCATOR=Enable source location support for generated code
-WSDL2JAVA_XJC_SYNC_METHODS=Generate accessor methods with the 'synchronized' keyword
-WSDL2JAVA_XJC_MARK_GENERATED=Add @Generated annotations to the generated code
-#Mark the generated code as @javax.annotation.Generated
-WSDL2JAVA_XJC_EPISODE_FILE= Generate the episode file for separate compilation
-#Resource Selection Dialog
-RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON=Browse Workspace...
-RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON=Browse File System...
-RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR=File Not Found
-
-WSDL2JAVA_OUTPUT_DIRECTORY=&Output Directory:
-WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP=Specify the directory into which the generated code files are written
-
-WSDL2JAVA_PACKAGE_NAME=&Package Name:
-WSDL2JAVA_PACKAGE_NAME_TOOLTIP=The java package name to use for the generated code.
-
-WSDL2JAVA_PACKAGE_NAME_OPTIONAL=Specify &WSDL Namepsace to Package Name Mappings
-WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP=Optionally specify the wsdl namespace mapping to a particular java package name
-
-WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER=WSDL Namespace
-WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER=Package Name
-
-WSDL2JAVA_SERVICE_NAME=&Service Name:
-WSDL2JAVA_SERVICE_NAME_TOOLTIP=Specify the name of the WSDL service for which code is to be generated. The default is to generate code for every service in the WSDL document
-
-WSDL2JAVA_BINDING_FILES=&Binding Files:
-WSDL2JAVA_BINDING_NAME_TOOLTIP=Specify zero, or more, JAXWS or JAXB binding files.
-WSDL2JAVA_BINDING_FILES_ADD=&Add...
-WSDL2JAVA_BINDING_FILES_REMOVE=&Remove...
-
-WSDL2JAVA_BINDING_FILE_DIALOG_TITLE=Browse for Binding File
-WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE=Binding File:
-WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME=JAXWS or JAXB Binding Files (*.xml)
-
-WSDL2JAVA_XML_CATLOG=XML Catalog:
-WSDL2JAVA_XML_CATLOG_TOOLTIP=Specify catalog file to map the imported wsdl/schema
-WSDL2JAVA_XML_CATLOG_BROWSE=Browse...
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java
deleted file mode 100644
index edbe000..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.dialogs;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * A <code>SelectionStatusDialog</code> which allows the selection of files
- * with a specific extension from the workspace or file system.
- *
- * @author sclarke
- */
-public class ResourceSelectionDialog extends SelectionStatusDialog {
- private IStatus OK_FILE_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private IStatus ERROR_FILE_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
- CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR);
-
- private IStatus VALIDATE_SELECTION_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private Text resourceText;
-
- private String filterExtension;
- private String filterName;
-
- /**
- * Creates an instance of <code>ResourceSelectionDialog</code>
- *
- * @param parent
- * @param filterExtension
- * the file name extension which the dialogs will use to filter
- * files
- * @param filterName
- * the name that describes the filterExtension
- * @param dialogTitle
- * the dialog title
- */
- public ResourceSelectionDialog(Shell parent, String filterExtension, String filterName, String dialogTitle) {
- super(parent);
-
- this.filterExtension = filterExtension;
- this.filterName = filterName;
-
- setTitle(dialogTitle);
- setStatusLineAboveButtons(true);
- int shellStyle = getShellStyle();
- setShellStyle(shellStyle | SWT.MAX | SWT.RESIZE);
- updateStatus(VALIDATE_SELECTION_STATUS);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- final Composite composite = (Composite) super.createDialogArea(parent);
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.widthHint = 500;
- buttonComposite.setLayoutData(gridData);
-
- GridLayout gridLayout = new GridLayout(3, false);
- buttonComposite.setLayout(gridLayout);
-
- Label messageLabel = createMessageArea(buttonComposite);
- gridData = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
- messageLabel.setLayoutData(gridData);
-
- Button browseWorkspace = new Button(buttonComposite, SWT.PUSH);
- browseWorkspace.setText(CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON);
- browseWorkspace.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- SelectionDialog dialog = createWorkspaceResourceDialog(composite.getShell());
- if (dialog.open() == SelectionDialog.OK) {
- Object[] result = dialog.getResult();
- IResource resource = (IResource) result[0];
- resourceText.setText(resource.getLocation().toOSString());
- }
- }
- });
-
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseWorkspace.setLayoutData(gridData);
-
- Button browseFileSystem = new Button(buttonComposite, SWT.PUSH);
- browseFileSystem.setText(CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON);
- browseFileSystem.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- FileDialog dialog = createFileSystemResourceDialog(composite.getShell());
- String result = dialog.open();
- if (result == null) {
- return;
- }
- IPath filterPath = new Path(dialog.getFilterPath());
- String buildFileName = dialog.getFileName();
- IPath path = filterPath.append(buildFileName).makeAbsolute();
-
- resourceText.setText(path.toOSString());
- }
- });
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseFileSystem.setLayoutData(gridData);
-
- resourceText = new Text(buttonComposite, SWT.BORDER);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- resourceText.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent event) {
- String resource = resourceText.getText();
- File file = new File(resource);
- if (file.exists()) {
- setResult(Arrays.asList(resource));
- updateStatus(OK_FILE_STATUS);
- } else {
- updateStatus(ERROR_FILE_STATUS);
- }
- }
- });
- gridData.horizontalSpan = 3;
- resourceText.setLayoutData(gridData);
-
- return composite;
- }
-
- private SelectionDialog createWorkspaceResourceDialog(Shell shell) {
- ElementTreeSelectionDialog workspaceResourceDialog = new ElementTreeSelectionDialog(shell,
- new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
- workspaceResourceDialog.setTitle(getMessage());
- workspaceResourceDialog.setMessage(filterName);
- workspaceResourceDialog.setAllowMultiple(false);
-
- workspaceResourceDialog.addFilter(new ViewerFilter() {
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (element instanceof IFile) {
- IFile file = (IFile) element;
- return file.isAccessible() && file.getFileExtension().equals(filterExtension);
- }
-
- if (element instanceof IProject && !((IProject) element).isOpen()) {
- IProject project = (IProject) element;
- return project.isAccessible();
- }
-
- if (element instanceof IContainer) {
- try {
- IContainer container = (IContainer) element;
- IResource[] resources = container.members();
- for (IResource resource : resources) {
- if (select(viewer, parentElement, resource)) {
- return true;
- }
- }
- } catch (CoreException ce) {
- CXFUIPlugin.log(ce.getStatus());
- }
- }
- return false;
- }
- });
-
- workspaceResourceDialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length > 0) {
- Object selected = selection[0];
- if (selected instanceof IFile) {
- IFile file = (IFile) selected;
- if (file.getFileExtension().equals(filterExtension)) {
- return OK_FILE_STATUS;
- }
- }
- }
- return VALIDATE_SELECTION_STATUS;
- }
- });
-
- workspaceResourceDialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
- return workspaceResourceDialog;
- }
-
- private FileDialog createFileSystemResourceDialog(Shell shell) {
- FileDialog dialog = new FileDialog(shell, SWT.OPEN);
- dialog.setFilterExtensions(new String[] { "*" + filterExtension }); //$NON-NLS-1$;
- dialog.setFilterNames(new String[] { filterName });
- return dialog;
- }
-
- @Override
- protected void computeResult() {
- // do nothing
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java
deleted file mode 100644
index bb6dce4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.preferences;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.AnnotationsComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.BlankRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.CXF20WSDL2JavaPreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.CXF21WSDL2JavaPreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSDLRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.SpringConfigComposite;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.osgi.framework.Version;
-
-/**
- * @author sclarke
- */
-public class CXFRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
- private IStatus CXF_LOCATION_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, null);
- private IStatus OK_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private Pattern digitPattern = Pattern.compile("\\d"); //$NON-NLS-1$
-
- private Button browseButton;
- private Text cxfHomeDirText;
-
- private Label cxfToolVersionLabel;
-
- private Button exportCXFClasspathContainerButton;
-
- private CXFContext context;
-
- private Java2WSDLRuntimePreferencesComposite java2WSDLRuntimePreferencesComposite;
- private Java2WSRuntimePreferencesComposite java2WSRuntimePreferencesComposite ;
-
- private CXF20WSDL2JavaPreferencesComposite cxf20WSDL2JavaPreferencesComposite;
- private CXF21WSDL2JavaPreferencesComposite cxf21WSDL2JavaPreferencesComposite;
-
- private AnnotationsComposite annotationsComposite;
-
- private SpringConfigComposite springConfigComposite;
-
- private StackLayout java2WSStackLayout;
- private StackLayout wsdl2javaStackLayout;
- private StackLayout jaxwsStackLayout;
- private StackLayout springConfigStackLayout;
-
- private Composite java2WSPreferncesGroup;
- private Composite wsdl2JavaPreferencesGroup;
- private Composite jaxwsPreferencesGroup;
- private Composite springConfigPreferncesGroup;
-
- private Composite java2WSDLPreferencesComposite;
- private Composite java2WSPreferencesComposite;
-
- private Composite jaxwsPreferencesComposite;
-
- private Composite wsdl2Java20PreferencesComposite;
- private Composite wsdl2Java21PreferencesComposite;
-
- private Composite springPreferencesComposite;
-
- private BlankRuntimePreferencesComposite java2WSBlankPreferencesComposite;
- private BlankRuntimePreferencesComposite wsdl2JavaBlankPreferencesComposite;
- private BlankRuntimePreferencesComposite jaxwsBlankPreferencesComposite;
- private BlankRuntimePreferencesComposite springConfigBlankPreferencesComposite;
-
- public CXFRuntimePreferencePage() {
- }
-
- public void init(IWorkbench workbench) {
- }
-
- @Override
- protected Control createContents(Composite parent) {
- context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- final Composite composite = new Composite(parent, SWT.NONE);
-
- GridLayout mainLayout = new GridLayout();
- composite.setLayout(mainLayout);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gridData);
-
- TabFolder cxfPreferenceTab = new TabFolder(composite, SWT.NONE);
- gridData = new GridData(GridData.FILL_BOTH);
- cxfPreferenceTab.setLayoutData(gridData);
-
- //CXF Runtime Location
- TabItem runtimeInstalLocationItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- runtimeInstalLocationItem.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME);
- runtimeInstalLocationItem
- .setToolTipText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP);
-
- final Composite runtimeGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- runtimeInstalLocationItem.setControl(runtimeGroup);
- runtimeGroup.setToolTipText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP);
-
- GridLayout runtimeLoactionlayout = new GridLayout();
-
- runtimeLoactionlayout.numColumns = 3;
- runtimeLoactionlayout.marginHeight = 10;
- runtimeGroup.setLayout(runtimeLoactionlayout);
- gridData = new GridData(GridData.FILL_BOTH);
- runtimeGroup.setLayoutData(gridData);
-
- Label label = new Label(runtimeGroup, SWT.NONE);
- label.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL);
-
- cxfHomeDirText = new Text(runtimeGroup, SWT.BORDER);
- if (context.getCxfRuntimeLocation() != null) {
- cxfHomeDirText.setText(context.getCxfRuntimeLocation());
- }
-
- gridData = new GridData(GridData.FILL_HORIZONTAL);
-
- cxfHomeDirText.setLayoutData(gridData);
- cxfHomeDirText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- context.setCxfRuntimeLocation(cxfHomeDirText.getText());
- updateStatus();
- handlePreferenceControls();
- }
- });
-
- browseButton = new Button(runtimeGroup, SWT.NONE);
- browseButton.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL);
-
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- DirectoryDialog fileDialog = new DirectoryDialog(composite.getShell());
- String fileName = fileDialog.open();
- if (fileName != null) {
- cxfHomeDirText.setText(fileName);
- context.setCxfRuntimeLocation(cxfHomeDirText.getText());
- }
- }
- });
-
- // CXF Version
- Label cxfVersionLabel = new Label(runtimeGroup, SWT.NONE);
- cxfVersionLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSON_LABEL);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- cxfVersionLabel.setLayoutData(gridData);
-
- cxfToolVersionLabel = new Label(runtimeGroup, SWT.NONE);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 2;
- cxfToolVersionLabel.setLayoutData(gridData);
-
- Label paddingLabel = new Label(runtimeGroup, SWT.NONE);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- paddingLabel.setLayoutData(gridData);
-
- exportCXFClasspathContainerButton = new Button(runtimeGroup, SWT.CHECK);
- exportCXFClasspathContainerButton.setText(
- CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER);
- exportCXFClasspathContainerButton.setSelection(context.isExportCXFClasspathContainer());
- exportCXFClasspathContainerButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- context.setExportCXFClasspathContainer(((Button) e.widget).getSelection());
- }
- });
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- exportCXFClasspathContainerButton.setLayoutData(gridData);
-
- if (context.getCxfRuntimeVersion().length() > 0) {
- cxfToolVersionLabel.setText(context.getCxfRuntimeEdition() + " " + context.getCxfRuntimeVersion()); //$NON-NLS-1$
- exportCXFClasspathContainerButton.setEnabled(true);
- } else {
- exportCXFClasspathContainerButton.setEnabled(false);
- }
-
- //Java2WS
- TabItem java2WSTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- java2WSTabItem.setText(CXFUIMessages.JAVA2WS_PREFERENCES_TAB_NAME);
- java2WSTabItem.setToolTipText(CXFUIMessages.JAVA2WS_PREFERENCES_TAB_TOOLTIP);
-
- java2WSPreferncesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- java2WSStackLayout = new StackLayout();
- java2WSPreferncesGroup.setLayout(java2WSStackLayout);
-
- java2WSDLPreferencesComposite = new Composite(java2WSPreferncesGroup, SWT.NONE);
- GridLayout java2WSGridLayout = new GridLayout(1, true);
- java2WSDLPreferencesComposite.setLayout(java2WSGridLayout);
-
- java2WSDLRuntimePreferencesComposite = new Java2WSDLRuntimePreferencesComposite(
- java2WSDLPreferencesComposite, SWT.NONE, cxfPreferenceTab);
- java2WSDLRuntimePreferencesComposite.addControls();
-
- java2WSPreferencesComposite = new Composite(java2WSPreferncesGroup, SWT.NONE);
- GridLayout java2WSDLGridLayout = new GridLayout(1, true);
- java2WSPreferencesComposite.setLayout(java2WSDLGridLayout);
-
- java2WSRuntimePreferencesComposite = new Java2WSRuntimePreferencesComposite(
- java2WSPreferencesComposite, SWT.NONE, cxfPreferenceTab);
- java2WSRuntimePreferencesComposite.addControls();
-
- java2WSBlankPreferencesComposite = new BlankRuntimePreferencesComposite(java2WSPreferncesGroup,
- SWT.NONE);
-
- java2WSTabItem.setControl(java2WSPreferncesGroup);
-
- //WSDL2Java
- TabItem wsdl2JavaTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- wsdl2JavaTabItem.setText(CXFUIMessages.WSDL2JAVA_PREFERENCES_TAB_NAME);
- wsdl2JavaTabItem.setToolTipText(CXFUIMessages.WSDL2JAVA_PREFERENCES_TAB_TOOLTIP);
-
- wsdl2JavaPreferencesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- wsdl2javaStackLayout = new StackLayout();
- wsdl2JavaPreferencesGroup.setLayout(wsdl2javaStackLayout);
-
- wsdl2Java20PreferencesComposite = new Composite(wsdl2JavaPreferencesGroup, SWT.NONE);
- GridLayout wsdl2Java20GridLayout = new GridLayout(1, true);
- wsdl2Java20PreferencesComposite.setLayout(wsdl2Java20GridLayout);
-
- cxf20WSDL2JavaPreferencesComposite = new CXF20WSDL2JavaPreferencesComposite(
- wsdl2Java20PreferencesComposite, SWT.NONE);
- cxf20WSDL2JavaPreferencesComposite.addControls();
-
- wsdl2Java21PreferencesComposite = new Composite(wsdl2JavaPreferencesGroup, SWT.NONE);
- GridLayout wsdl2Java21GridLayout = new GridLayout(1, true);
- wsdl2Java21PreferencesComposite.setLayout(wsdl2Java21GridLayout);
-
- cxf21WSDL2JavaPreferencesComposite = new CXF21WSDL2JavaPreferencesComposite(
- wsdl2Java21PreferencesComposite, SWT.NONE);
- cxf21WSDL2JavaPreferencesComposite.addControls();
-
- wsdl2JavaBlankPreferencesComposite = new BlankRuntimePreferencesComposite(wsdl2JavaPreferencesGroup,
- SWT.NONE);
-
- wsdl2JavaTabItem.setControl(wsdl2JavaPreferencesGroup);
-
- //JAX-WS
- TabItem annotationsTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- annotationsTabItem.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_TAB_NAME);
- annotationsTabItem.setToolTipText(CXFUIMessages.ANNOTATIONS_PREFERENCES_TAB_TOOLTIP);
-
- jaxwsPreferencesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- jaxwsStackLayout = new StackLayout();
- jaxwsPreferencesGroup.setLayout(jaxwsStackLayout);
-
- jaxwsPreferencesComposite = new Composite(jaxwsPreferencesGroup, SWT.NONE);
- GridLayout jaxwsGridLayout = new GridLayout(1, true);
- jaxwsPreferencesComposite.setLayout(jaxwsGridLayout);
- annotationsComposite = new AnnotationsComposite(jaxwsPreferencesComposite, SWT.SHADOW_IN);
-
- jaxwsBlankPreferencesComposite = new BlankRuntimePreferencesComposite(jaxwsPreferencesGroup,
- SWT.NONE);
-
- annotationsTabItem.setControl(jaxwsPreferencesGroup);
-
- //Spring Config
- TabItem springConfigTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
- springConfigTabItem.setText(CXFUIMessages.SPRING_CONFIG_PREFERENCES_TAB_NAME);
- springConfigTabItem.setToolTipText(CXFUIMessages.SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP);
-
- springConfigPreferncesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
- springConfigStackLayout = new StackLayout();
- springConfigPreferncesGroup.setLayout(springConfigStackLayout);
-
- springPreferencesComposite = new Composite(springConfigPreferncesGroup, SWT.NONE);
- GridLayout springGridLayout = new GridLayout(1, true);
- springPreferencesComposite.setLayout(springGridLayout);
- springConfigComposite = new SpringConfigComposite(springPreferencesComposite, SWT.SHADOW_IN);
-
- springConfigBlankPreferencesComposite = new BlankRuntimePreferencesComposite(springConfigPreferncesGroup,
- SWT.NONE);
-
- springConfigTabItem.setControl(springConfigPreferncesGroup);
-
- handlePreferenceControls();
-
- return composite;
- }
-
- private void handlePreferenceControls() {
- if (context.getCxfRuntimeLocation().equals("") || context.getCxfRuntimeVersion().equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
- java2WSStackLayout.topControl = java2WSBlankPreferencesComposite;
- wsdl2javaStackLayout.topControl = wsdl2JavaBlankPreferencesComposite;
- jaxwsStackLayout.topControl = jaxwsBlankPreferencesComposite;
- springConfigStackLayout.topControl = springConfigBlankPreferencesComposite;
- } else if (context.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- java2WSStackLayout.topControl = java2WSPreferencesComposite;
- wsdl2javaStackLayout.topControl = wsdl2Java21PreferencesComposite;
- jaxwsStackLayout.topControl = jaxwsPreferencesComposite;
- springConfigStackLayout.topControl = springPreferencesComposite;
- } else {
- java2WSStackLayout.topControl = java2WSDLPreferencesComposite;
- wsdl2javaStackLayout.topControl = wsdl2Java20PreferencesComposite;
- jaxwsStackLayout.topControl = jaxwsPreferencesComposite;
- springConfigStackLayout.topControl = springPreferencesComposite;
- }
- java2WSPreferncesGroup.layout();
- wsdl2JavaPreferencesGroup.layout();
- jaxwsPreferencesGroup.layout();
- springConfigPreferncesGroup.layout();
- refresh();
- }
-
- private IStatus checkRuntimeExist(String path) {
- File cxfHomeDir = new File(path);
- if (cxfHomeDirText.getText().equals("")) { //$NON-NLS-1$
- CXF_LOCATION_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
- CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
- }
- String cxfLibPath = cxfHomeDir + System.getProperty("file.separator") + "lib"; //$NON-NLS-1$ //$NON-NLS-2$
- if (cxfHomeDir.isDirectory()) {
- File cxfLibFolder = new File(cxfLibPath);
- if (cxfLibFolder.isDirectory()) {
- String[] cxfJarFiles = getCXFJarFiles(cxfLibFolder);
- if (cxfJarFiles != null && cxfJarFiles.length > 0) {
- IStatus toolVersionStatus = getToolVersion(cxfLibPath);
- processToolVersion(toolVersionStatus);
- CXF_LOCATION_STATUS = OK_STATUS;
- exportCXFClasspathContainerButton.setEnabled(true);
- return CXF_LOCATION_STATUS;
- }
- }
- }
- context.setCxfRuntimeLocation(""); //$NON-NLS-1$
- context.setCxfRuntimeVersion(""); //$NON-NLS-1$
- cxfToolVersionLabel.setText(""); //$NON-NLS-1$
- exportCXFClasspathContainerButton.setEnabled(false);
- CXF_LOCATION_STATUS = new Status(Status.ERROR, CXFUIPlugin.PLUGIN_ID,
- CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
- return CXF_LOCATION_STATUS;
- }
-
- private IStatus getToolVersion(String cxLibFolderPath) {
- File cxfLibFolder = new File(cxLibFolderPath);
- List<String> cxfLib = new ArrayList<String>();
- String[] jarFiles = cxfLibFolder.list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- if (name.endsWith(".jar")) { //$NON-NLS-1$
- return true;
- }
- return false;
- }
- });
-
- for (String jarFile : jarFiles) {
- cxfLib.add(cxLibFolderPath + System.getProperty("file.separator") + jarFile); //$NON-NLS-1$
- }
-
- IStatus toolVersionStatus = LaunchUtils.launch(cxfLib.toArray(new String[cxfLib.size()]),
- "org.apache.cxf.tools.wsdlto.WSDLToJava", new String[] { "-v" }); //$NON-NLS-1$ //$NON-NLS-2$
- return toolVersionStatus;
- }
-
- private String[] getCXFJarFiles(File directory) {
- String[] cxfJarFiles = directory.list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- if (name.startsWith("cxf") && name.endsWith(".jar") //$NON-NLS-1$ //$NON-NLS-2$
- && digitPattern.matcher(name).find()) {
- return true;
- }
- return false;
- }
- });
- return cxfJarFiles;
- }
-
- private void processToolVersion(IStatus toolVersionStatus) {
- if (toolVersionStatus.getSeverity() == IStatus.INFO) {
- String cxfToolVersion = toolVersionStatus.getMessage();
-
- cxfToolVersion = cxfToolVersion.substring(cxfToolVersion.indexOf("-") + 1, //$NON-NLS-1$
- cxfToolVersion.length()).trim();
-
- String cxfRuntimeEdition = ""; //$NON-NLS-1$
- String cxfRuntimeVersion = ""; //$NON-NLS-1$
-
- Matcher matcher = digitPattern.matcher(cxfToolVersion);
- if (matcher.find()) {
- int start = matcher.start();
- int end = matcher.end();
- while (matcher.find()) {
- end = matcher.end();
- }
- cxfRuntimeEdition = cxfToolVersion.substring(0, start).trim();
- cxfRuntimeVersion = cxfToolVersion.substring(start, end);
- }
-
- cxfToolVersionLabel.setText(cxfRuntimeEdition + " " + cxfRuntimeVersion); //$NON-NLS-1$
-
- context.setCxfRuntimeVersion(cxfRuntimeVersion);
- context.setCxfRuntimeEdition(cxfRuntimeEdition);
-
- CXFCorePlugin.getDefault().setCurrentRuntimeVersion(new Version(cxfRuntimeVersion));
- }
- }
-
- private void updateStatus() {
- CXF_LOCATION_STATUS = checkRuntimeExist(cxfHomeDirText.getText());
- applyStatusToPage(findMostSevere());
- }
-
- private void applyStatusToPage(IStatus status) {
- String message = status.getMessage();
- if (status.getSeverity() > IStatus.OK) {
- setErrorMessage(message);
- } else {
- setMessage(getTitle());
- setErrorMessage(null);
- }
-
- }
-
- private IStatus findMostSevere() {
- return CXF_LOCATION_STATUS;
- }
-
- private void setDefaults() {
- exportCXFClasspathContainerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER));
-
- java2WSDLRuntimePreferencesComposite.setDefaults();
- java2WSRuntimePreferencesComposite.setDefaults();
- cxf20WSDL2JavaPreferencesComposite.setDefaults();
- cxf21WSDL2JavaPreferencesComposite.setDefaults();
- annotationsComposite.setDefaults();
- springConfigComposite.setDefaults();
- }
-
- private void refresh() {
- if (context.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- java2WSRuntimePreferencesComposite.refresh();
- cxf21WSDL2JavaPreferencesComposite.refresh();
- } else {
- java2WSDLRuntimePreferencesComposite.refresh();
- cxf20WSDL2JavaPreferencesComposite.refresh();
- }
- }
-
- private void storeValues() {
- context.setExportCXFClasspathContainer(exportCXFClasspathContainerButton.getSelection());
-
- if (context.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- java2WSRuntimePreferencesComposite.storeValues();
- cxf21WSDL2JavaPreferencesComposite.storeValues();
- } else {
- java2WSDLRuntimePreferencesComposite.storeValues();
- cxf20WSDL2JavaPreferencesComposite.storeValues();
- }
- annotationsComposite.storeValues();
- springConfigComposite.storeValues();
- }
-
- @Override
- protected void performApply() {
- super.performApply();
- }
-
- @Override
- public boolean performCancel() {
- return super.performCancel();
- }
-
- @Override
- protected void performDefaults() {
- super.performDefaults();
- setDefaults();
- }
-
- @Override
- public boolean performOk() {
- storeValues();
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java
deleted file mode 100644
index 98d34b5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.WSDLUtils;
-
-/**
- * @author sclarke
- */
-public class PackageNameColumnLabelProvider extends ColumnLabelProvider {
- private Map<String, String> includedNamespaces;
-
- public PackageNameColumnLabelProvider(WSDL2JavaDataModel model) {
- includedNamespaces = model.getIncludedNamespaces();
- }
-
- @Override
- public String getText(Object element) {
- if (includedNamespaces.containsKey(element)) {
- return includedNamespaces.get(element);
- }
- return WSDLUtils.getPackageNameFromNamespace(element.toString());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java
deleted file mode 100644
index 5922c61..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.WSDLUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author sclarke
- */
-public class PackageNameEditingSupport extends EditingSupport implements SelectionListener {
- private CellEditor packageNameCellEditor;
- private Table table;
- private Map<String, String> includedNamespaces;
-
- public PackageNameEditingSupport(TableViewer tableViewer, CellEditor packageNameCellEditor,
- WSDL2JavaDataModel model) {
- super(tableViewer);
- this.table = tableViewer.getTable();
- this.packageNameCellEditor = packageNameCellEditor;
- includedNamespaces = model.getIncludedNamespaces();
- table.addSelectionListener(this);
- }
-
- @Override
- protected boolean canEdit(Object element) {
- return table.getSelection()[0].getChecked();
- }
-
- @Override
- protected CellEditor getCellEditor(Object element) {
- return packageNameCellEditor;
- }
-
- @Override
- protected Object getValue(Object element) {
- if (includedNamespaces.containsKey(element)) {
- return includedNamespaces.get(element);
- }
- return WSDLUtils.getPackageNameFromNamespace(element.toString());
- }
-
- @Override
- protected void setValue(Object namespace, Object packageName) {
- if (namespace != null && packageName != null) {
- includedNamespaces.put(namespace.toString(), packageName.toString());
- getViewer().update(namespace, null);
- }
- }
-
- public void widgetSelected(SelectionEvent event) {
- if (event.detail == SWT.CHECK) {
- TableItem item = (TableItem) event.item;
- String namespaceKey = item.getText(0);
- String packageName = item.getText(1);
- if (item.getChecked()) {
- if (!includedNamespaces.containsKey(namespaceKey)) {
- includedNamespaces.put(namespaceKey, packageName);
- }
- } else {
- if (includedNamespaces.containsKey(namespaceKey)) {
- includedNamespaces.remove(namespaceKey);
- }
- }
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java
deleted file mode 100644
index bdfb63d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.jface.viewers.ArrayContentProvider;
-
-/**
- * @author sclarke
- */
-public class PackageNameTableContentProvider extends ArrayContentProvider {
-
- @Override
- @SuppressWarnings("unchecked")
- public Object[] getElements(Object inputElement) {
- java.util.List<Object> elements = new ArrayList<Object>();
- if (inputElement instanceof Definition) {
- Definition definition = (Definition) inputElement;
- Map namespaces = definition.getNamespaces();
- Collection values = namespaces.values();
- for (Object namespaceValue : values) {
- String namespace = namespaceValue.toString();
- if (!namespace.equals(definition.getTargetNamespace()) && !elements.contains(namespace)) {
- elements.add(namespace);
- }
- }
- }
- return elements.toArray(new Object[elements.size()]);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java
deleted file mode 100644
index f97afe3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-/**
- *
- * @author sclarke
- *
- */
-public class AnnotationsComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Button generateWebMethodButton;
- private Button generateWebParamButton;
- private Button generateRequestWrapperButton;
- private Button generateResponseWrapperButton;
-
- private Button enableAPTButton;
-
- public AnnotationsComposite(Composite parent, int style) {
- super(parent, style);
- addControls();
- }
-
- private void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group jaxwsAnnotationsGroup = new Group(this, SWT.SHADOW_IN);
- jaxwsAnnotationsGroup.setText(CXFUIMessages.JAXWS_ANNOTATIONS_GROUP_LABEL);
- jaxwsAnnotationsGroup.setToolTipText(CXFUIMessages.JAXWS_ANNOTATIONS_GROUP_TOOLTIP);
- GridLayout gridLayout = new GridLayout(1, true);
- jaxwsAnnotationsGroup.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- jaxwsAnnotationsGroup.setLayoutData(gridData);
-
- generateWebMethodButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateWebMethodButton.setText(CXFUIMessages.JAXWS_GENERATE_WEB_METHOD);
- generateWebMethodButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setGenerateWebMethodAnnotation(selected);
- }
- });
- generateWebMethodButton.setSelection(context.isGenerateWebMethodAnnotation());
-
- generateWebParamButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateWebParamButton.setText(CXFUIMessages.JAXWS_GENERATE_WEB_PARAM);
- generateWebParamButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setGenerateWebParamAnnotation(selected);
- }
- });
- generateWebParamButton.setSelection(context.isGenerateWebParamAnnotation());
-
- generateRequestWrapperButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateRequestWrapperButton.setText(CXFUIMessages.JAXWS_GENERATE_REQUEST_WRAPPER);
- generateRequestWrapperButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setGenerateRequestWrapperAnnotation(selected);
- }
- });
- generateRequestWrapperButton.setSelection(context.isGenerateRequestWrapperAnnotation());
-
- generateResponseWrapperButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateResponseWrapperButton.setText(CXFUIMessages.JAXWS_GENERATE_RESPONSE_WRAPPER);
- generateResponseWrapperButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setGenerateResponseWrapperAnnotation(selected);
- }
- });
- generateResponseWrapperButton.setSelection(context.isGenerateResponseWrapperAnnotation());
-
- Group annotationProcessingGroup = new Group(this, SWT.SHADOW_IN);
- annotationProcessingGroup.setText(CXFUIMessages.JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL);
- annotationProcessingGroup.setToolTipText(CXFUIMessages.bind(
- CXFUIMessages.JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP,
- context.getCxfRuntimeEdition()));
- gridLayout = new GridLayout(1, true);
- annotationProcessingGroup.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- annotationProcessingGroup.setLayoutData(gridData);
-
- enableAPTButton = new Button(annotationProcessingGroup, SWT.CHECK);
- enableAPTButton.setText(CXFUIMessages.JAXWS_ENABLE_ANNOTATION_PROCESSING);
- enableAPTButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setAnnotationProcessingEnabled(selected);
- }
- });
- enableAPTButton.setSelection(context.isAnnotationProcessingEnabled());
- }
-
- public void setDefaults() {
- generateWebMethodButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION));
-
- generateWebParamButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION));
-
- generateRequestWrapperButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION));
-
- generateResponseWrapperButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION));
-
- enableAPTButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED));
- }
-
- public void storeValues() {
- context.setGenerateWebMethodAnnotation(generateWebMethodButton.getSelection());
- context.setGenerateWebParamAnnotation(generateWebParamButton.getSelection());
- context.setGenerateRequestWrapperAnnotation(generateRequestWrapperButton.getSelection());
- context.setGenerateResponseWrapperAnnotation(generateResponseWrapperButton.getSelection());
- context.setAnnotationProcessingEnabled(enableAPTButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java
deleted file mode 100644
index 91824e7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author sclarke
- */
-public class BlankRuntimePreferencesComposite extends Composite {
-
- public BlankRuntimePreferencesComposite(Composite parent, int style) {
- super(parent, style);
-
- addControls();
- }
-
- private void addControls() {
- this.setLayout(new GridLayout());
- CLabel setIntallDirLabel = new CLabel(this, SWT.NONE);
- GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
- setIntallDirLabel.setLayoutData(gridData);
- setIntallDirLabel.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(
- ISharedImages.IMG_OBJS_ERROR_TSK));
- setIntallDirLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java
deleted file mode 100644
index f918e3b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author sclarke
- */
-public class CXF20WSDL2JavaPreferencesComposite extends Composite {
- WSDL2JavaContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-
- private Button generateServerButton;
- private Button generateImplementationButton;
- private Button processSOAPHeadersButton;
- private Button namespacePackageMappingButton;
- private Button excludesNamespaceMappingButton;
-
- private Button useDefaultValuesButton;
- private Button autoNameResolutionButton;
-
- private Table xjcArgsTable;
-
- private TableItem xjcDefaultValuesTableItem;
- private TableItem xjcToStringTableItem;
- private TableItem xjcToStringMultiLineTableItem;
- private TableItem xjcToStringSimpleTableItem;
- private TableItem xjcLocatorTableItem;
- private TableItem xjcSyncMethodsTableItem;
- private TableItem xjcMarkGeneratedTableItem;
-
- public CXF20WSDL2JavaPreferencesComposite(Composite parent, int style) {
- super(parent, style);
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(this, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(1, true);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- generateServerButton = WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, context);
- generateImplementationButton = WSDL2JavaWidgetFactory.createGenerateImplementationButton(
- wsdl2javaGroup, context);
-
- useDefaultValuesButton = WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, context);
-
- processSOAPHeadersButton = WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup,
- context);
-
- namespacePackageMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(
- wsdl2javaGroup, context);
-
- excludesNamespaceMappingButton = WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(
- wsdl2javaGroup, context);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- autoNameResolutionButton = WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup,
- context);
- }
-
- Group xjcArgGroup = new Group(this, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_GROUP_TITLE);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- xjcDefaultValuesTableItem = WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable,
- context);
- xjcToStringTableItem = WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, context);
- xjcToStringMultiLineTableItem = WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(
- xjcArgsTable, context);
- xjcToStringSimpleTableItem = WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable,
- context);
- xjcLocatorTableItem = WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, context);
- xjcSyncMethodsTableItem = WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, context);
- xjcMarkGeneratedTableItem = WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable,
- context);
- }
-
- public void setDefaults() {
- useDefaultValuesButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
- generateImplementationButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
- processSOAPHeadersButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
- namespacePackageMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
- excludesNamespaceMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
- }
-
- xjcDefaultValuesTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
- xjcToStringTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
- xjcToStringMultiLineTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
- xjcToStringSimpleTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
- xjcLocatorTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
- xjcSyncMethodsTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
- xjcMarkGeneratedTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
- }
-
- public void refresh() {
- useDefaultValuesButton.setSelection(context.isUseDefaultValues());
- generateServerButton.setSelection(context.isGenerateServer());
- generateImplementationButton.setSelection(context.isGenerateImplementation());
- processSOAPHeadersButton.setSelection(context.isProcessSOAPHeaders());
- namespacePackageMappingButton.setSelection(context.isLoadDefaultNamespacePackageNameMapping());
- excludesNamespaceMappingButton.setSelection(context.isLoadDefaultExcludesNamepsaceMapping());
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(context.isAutoNameResolution());
- }
-
- xjcDefaultValuesTableItem.setChecked(context.isXjcUseDefaultValues());
- xjcToStringTableItem.setChecked(context.isXjcToString());
- xjcToStringMultiLineTableItem.setChecked(context.isXjcToStringMultiLine());
- xjcToStringSimpleTableItem.setChecked(context.isXjcToStringSimple());
- xjcLocatorTableItem.setChecked(context.isXjcLocator());
- xjcSyncMethodsTableItem.setChecked(context.isXjcSyncMethods());
- xjcMarkGeneratedTableItem.setChecked(context.isXjcMarkGenerated());
- }
-
- public void storeValues() {
- context.setUseDefaultValues(useDefaultValuesButton.getSelection());
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateImplementation(generateImplementationButton.getSelection());
- context.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
- context.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
- context.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-
- if (canUpdateAutoNameResolution()) {
- context.setAutoNameResolution(autoNameResolutionButton.getSelection());
- }
-
- context.setXjcUseDefaultValues(xjcDefaultValuesTableItem.getChecked());
- context.setXjcToString(xjcToStringTableItem.getChecked());
- context.setXjcToStringMultiLine(xjcToStringMultiLineTableItem.getChecked());
- context.setXjcToStringSimple(xjcToStringSimpleTableItem.getChecked());
- context.setXjcLocator(xjcLocatorTableItem.getChecked());
- context.setXjcSyncMethods(xjcSyncMethodsTableItem.getChecked());
- context.setXjcMarkGenerated(xjcMarkGeneratedTableItem.getChecked());
- }
-
- private boolean canUpdateAutoNameResolution() {
- return autoNameResolutionButton != null && CXFModelUtils.isAutoNameResolutionPermitted();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java
deleted file mode 100644
index b856865..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author sclarke
- */
-public class CXF21WSDL2JavaPreferencesComposite extends Composite {
- WSDL2JavaContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-
- private Button generateServerButton;
- private Button generateImplementationButton;
- private Button processSOAPHeadersButton;
- private Button namespacePackageMappingButton;
- private Button excludesNamespaceMappingButton;
-
- private Table xjcArgsTable;
-
- private TableItem xjcDefaultValuesTableItem;
- private TableItem xjcToStringTableItem;
- private TableItem xjcToStringMultiLineTableItem;
- private TableItem xjcToStringSimpleTableItem;
- private TableItem xjcLocatorTableItem;
- private TableItem xjcSyncMethodsTableItem;
- private TableItem xjcMarkGeneratedTableItem;
-
- private Button useDefaultValuesButton;
- private Button noAddressBindingButton;
- private Button autoNameResolutionButton;
-
- public CXF21WSDL2JavaPreferencesComposite(Composite parent, int style) {
- super(parent, style);
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(this, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(2, false);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- // Frontend
- // WSDL2JavaWidgetFactory.createFrontendLabel(wsdl2javaGroup);
- // Combo frontendCombo =
- // WSDL2JavaWidgetFactory.createFrontendCombo(wsdl2javaGroup, context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // frontendCombo.setLayoutData(gridData);
-
- // Databinding
- // WSDL2JavaWidgetFactory.createDatabindingLabel(wsdl2javaGroup);
- // Combo databindingCombo =
- // WSDL2JavaWidgetFactory.createDatabindingCombo(wsdl2javaGroup,
- // context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // databindingCombo.setLayoutData(gridData);
-
- // WSDL Version
- // WSDL2JavaWidgetFactory. createWSDLVersionLabel(wsdl2javaGroup);
- // Combo wsdlVersionCombo =
- // WSDL2JavaWidgetFactory.createWSDLVersionCombo(wsdl2javaGroup,
- // context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // wsdlVersionCombo.setLayoutData(gridData);
-
- generateServerButton = WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- generateServerButton.setLayoutData(gridData);
-
- generateImplementationButton = WSDL2JavaWidgetFactory.createGenerateImplementationButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- generateImplementationButton.setLayoutData(gridData);
-
- useDefaultValuesButton = WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- useDefaultValuesButton.setLayoutData(gridData);
-
- processSOAPHeadersButton = WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup,
- context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- processSOAPHeadersButton.setLayoutData(gridData);
-
- namespacePackageMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- namespacePackageMappingButton.setLayoutData(gridData);
-
- excludesNamespaceMappingButton = WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- excludesNamespaceMappingButton.setLayoutData(gridData);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- autoNameResolutionButton = WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- autoNameResolutionButton.setLayoutData(gridData);
- }
-
- noAddressBindingButton = WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- noAddressBindingButton.setLayoutData(gridData);
-
- Group xjcArgGroup = new Group(this, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_GROUP_TITLE);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- xjcDefaultValuesTableItem = WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable,
- context);
- xjcToStringTableItem = WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, context);
- xjcToStringMultiLineTableItem = WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(
- xjcArgsTable, context);
- xjcToStringSimpleTableItem = WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable,
- context);
- xjcLocatorTableItem = WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, context);
- xjcSyncMethodsTableItem = WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, context);
- xjcMarkGeneratedTableItem = WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable,
- context);
- }
-
- public void setDefaults() {
- useDefaultValuesButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
- noAddressBindingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
- generateImplementationButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
-
- processSOAPHeadersButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
-
- namespacePackageMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
-
- excludesNamespaceMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
- }
-
- xjcDefaultValuesTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
-
- xjcToStringTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
-
- xjcToStringMultiLineTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
-
- xjcToStringSimpleTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
-
- xjcLocatorTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
-
- xjcSyncMethodsTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
-
- xjcMarkGeneratedTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
- }
-
- public void refresh() {
- useDefaultValuesButton.setSelection(context.isUseDefaultValues());
- noAddressBindingButton.setSelection(context.isNoAddressBinding());
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(context.isAutoNameResolution());
- }
-
- generateServerButton.setSelection(context.isGenerateServer());
- generateImplementationButton.setSelection(context.isGenerateImplementation());
- processSOAPHeadersButton.setSelection(context.isProcessSOAPHeaders());
- namespacePackageMappingButton.setSelection(context.isLoadDefaultNamespacePackageNameMapping());
- excludesNamespaceMappingButton.setSelection(context.isLoadDefaultExcludesNamepsaceMapping());
-
- xjcDefaultValuesTableItem.setChecked(context.isXjcUseDefaultValues());
- xjcToStringTableItem.setChecked(context.isXjcToString());
- xjcToStringMultiLineTableItem.setChecked(context.isXjcToStringMultiLine());
- xjcToStringSimpleTableItem.setChecked(context.isXjcToStringSimple());
- xjcLocatorTableItem.setChecked(context.isXjcLocator());
- xjcSyncMethodsTableItem.setChecked(context.isXjcSyncMethods());
- xjcMarkGeneratedTableItem.setChecked(context.isXjcMarkGenerated());
- }
-
- public void storeValues() {
- context.setUseDefaultValues(useDefaultValuesButton.getSelection());
- context.setNoAddressBinding(noAddressBindingButton.getSelection());
-
- if (canUpdateAutoNameResolution()) {
- context.setAutoNameResolution(autoNameResolutionButton.getSelection());
- }
-
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateImplementation(generateImplementationButton.getSelection());
- context.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
- context.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
- context.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-
- context.setXjcUseDefaultValues(xjcDefaultValuesTableItem.getChecked());
- context.setXjcToString(xjcToStringTableItem.getChecked());
- context.setXjcToStringMultiLine(xjcToStringMultiLineTableItem.getChecked());
- context.setXjcToStringSimple(xjcToStringSimpleTableItem.getChecked());
- context.setXjcLocator(xjcLocatorTableItem.getChecked());
- context.setXjcSyncMethods(xjcSyncMethodsTableItem.getChecked());
- context.setXjcMarkGenerated(xjcMarkGeneratedTableItem.getChecked());
- }
-
- private boolean canUpdateAutoNameResolution() {
- return autoNameResolutionButton != null && CXFModelUtils.isAutoNameResolutionPermitted();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java
deleted file mode 100644
index c9d1d42..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * @author sclarke
- */
-public class Java2WSDLRuntimePreferencesComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Combo soapBindingCombo;
- private Button createXSDImportsButton;
- private TabFolder tabFolder;
-
- public Java2WSDLRuntimePreferencesComposite(Composite parent, int style, TabFolder tabFolder) {
- super(parent, style);
- this.tabFolder = tabFolder;
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group java2wsdlGroup = new Group(this, SWT.SHADOW_IN);
- java2wsdlGroup.setText(CXFUIMessages.JAVA2WSDL_GROUP_LABEL);
- GridLayout java2wslayout = new GridLayout();
- java2wslayout.numColumns = 2;
- java2wsdlGroup.setLayout(java2wslayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- java2wsdlGroup.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createSOAPBindingLabel(java2wsdlGroup);
-
- soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(java2wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- soapBindingCombo.setLayoutData(gridData);
-
- createXSDImportsButton = Java2WSWidgetFactory.createXSDImportsButton(java2wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- createXSDImportsButton.setLayoutData(gridData);
-
- Link link = new Link(this, SWT.NONE);
- link.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_LINK);
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- tabFolder.setSelection(3);
- }
- });
- }
-
- public void setDefaults() {
- if (CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING)) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
- }
-
- public void refresh() {
- if (context.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
- createXSDImportsButton.setSelection(context.isGenerateXSDImports());
- }
-
- public void storeValues() {
- if (soapBindingCombo.getText().equals("SOAP 1.2")) {
- context.setSoap12Binding(true);
- } else {
- context.setSoap12Binding(false);
- }
-
- context.setGenerateXSDImports(createXSDImportsButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java
deleted file mode 100644
index 516f43e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * @author sclarke
- */
-public class Java2WSRuntimePreferencesComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Combo soapBindingCombo;
- private Button createXSDImportsButton;
-
- private Button generateClientButton;
- private Button generateServerButton;
- private Button generateWrapperFaultBeanButton;
- private Button generateWSDLButton;
-
- private TabFolder tabFolder;
-
- public Java2WSRuntimePreferencesComposite(Composite parent, int style, TabFolder tabFolder) {
- super(parent, style);
- this.tabFolder = tabFolder;
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout();
-
- preflayout.numColumns = 2;
- preflayout.marginHeight = 10;
- this.setLayout(preflayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- // Java2WS Group
- Group java2wsGroup = new Group(this, SWT.SHADOW_IN);
- java2wsGroup.setText(CXFUIMessages.JAVA2WS_GROUP_LABEL);
- GridLayout java2wslayout = new GridLayout();
-
- java2wslayout.numColumns = 3;
-
- java2wslayout.marginHeight = 10;
- java2wsGroup.setLayout(java2wslayout);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- java2wsGroup.setLayoutData(gridData);
-
- // Frontend
- Java2WSWidgetFactory.createFrontendLabel(java2wsGroup);
- Combo frontendCombo = Java2WSWidgetFactory.createFrontendCombo(java2wsGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- frontendCombo.setLayoutData(gridData);
-
- // Databinding
- Java2WSWidgetFactory.createDatabindingLabel(java2wsGroup);
- Combo databindingCombo = Java2WSWidgetFactory.createDatabindingCombo(java2wsGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- databindingCombo.setLayoutData(gridData);
-
- // Gen Client
- generateClientButton = Java2WSWidgetFactory.createGenerateClientButton(java2wsGroup, context);
-
- // Gen Server
- generateServerButton = Java2WSWidgetFactory.createGenerateServerButton(java2wsGroup, context);
-
- // Gen Wrapper and Fault Bean
- generateWrapperFaultBeanButton = Java2WSWidgetFactory.createGenerateWrapperFaultBeanButton(
- java2wsGroup, context);
-
- // Gen WSDL
- generateWSDLButton = Java2WSWidgetFactory.createGenerateWSDLButton(java2wsGroup, context);
- generateWSDLButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- enableWSDLGroup(generateWSDLButton.getSelection());
- }
- });
-
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 3;
- generateWSDLButton.setLayoutData(gridData);
-
- Group wsdlGroup = new Group(java2wsGroup, SWT.SHADOW_ETCHED_IN);
- GridLayout wsdlGroupLayout = new GridLayout(2, false);
- wsdlGroup.setLayout(wsdlGroupLayout);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 3;
- wsdlGroup.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createSOAPBindingLabel(wsdlGroup);
-
- soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- soapBindingCombo.setLayoutData(gridData);
-
- createXSDImportsButton = Java2WSWidgetFactory.createXSDImportsButton(wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- createXSDImportsButton.setLayoutData(gridData);
-
- Link link = new Link(this, SWT.NONE);
- link.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_LINK);
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- tabFolder.setSelection(3);
- }
- });
- enableWSDLGroup(context.isGenerateWSDL());
- }
-
- protected void enableWSDLGroup(boolean enable) {
- soapBindingCombo.setEnabled(enable);
- createXSDImportsButton.setEnabled(enable);
- }
-
- public void setDefaults() {
- if (CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING)) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
-
- generateClientButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
- generateWrapperFaultBeanButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS));
-
- generateWSDLButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL));
- }
-
- public void refresh() {
- if (context.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(context.isGenerateXSDImports());
- generateClientButton.setSelection(context.isGenerateClient());
- generateServerButton.setSelection(context.isGenerateServer());
- generateWrapperFaultBeanButton.setSelection(context.isGenerateWrapperFaultBeans());
- generateWSDLButton.setSelection(context.isGenerateWSDL());
- }
-
- public void storeValues() {
- if (soapBindingCombo.getText().equals("SOAP 1.2")) {
- context.setSoap12Binding(true);
- } else {
- context.setSoap12Binding(false);
- }
-
- context.setGenerateXSDImports(createXSDImportsButton.getSelection());
- context.setGenerateClient(generateClientButton.getSelection());
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateWrapperFaultBeans(generateWrapperFaultBeanButton.getSelection());
- context.setGenerateWSDL(generateWSDLButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java
deleted file mode 100644
index 0e2f1da..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Provides widgets for Java2WS preferences, wizards, dialogs. Enables the reuse
- * of widgets in multiple locations. Widgets have there labeling and tooltips
- * set here and where possible listeners are set which update instances of
- * <code>Java2WSContext</code> and <code>Java2WSDataModel</code>.
- *
- * @author sclarke
- */
-public final class Java2WSWidgetFactory {
-
- private Java2WSWidgetFactory() {
- }
-
- public static Label createSOAPBindingLabel(Composite parent) {
- Label defaultSoapBinding = new Label(parent, SWT.NONE);
- defaultSoapBinding.setText(CXFUIMessages.JAVA2WS_DEFAULT_SOAPBINDING_LABEL);
- return defaultSoapBinding;
- }
-
- public static Combo createSOAPBingCombo(Composite parent, final Java2WSContext context) {
- Combo soapBindingCombo = new Combo(parent, SWT.READ_ONLY);
- soapBindingCombo.setToolTipText(CXFUIMessages.JAVA2WS_SOAP12_BINDING_TOOLTIP);
- soapBindingCombo.add("SOAP 1.1"); //$NON-NLS-1$
- soapBindingCombo.add("SOAP 1.2"); //$NON-NLS-1$
- soapBindingCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String soapBinding = ((Combo) e.widget).getText();
- if (soapBinding.equals("SOAP 1.2")) { //$NON-NLS-1$
- context.setSoap12Binding(true);
- } else {
- context.setSoap12Binding(false);
- }
- }
- });
- if (context.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- return soapBindingCombo;
- }
-
- public static Button createXSDImportsButton(Composite parent, final Java2WSContext context) {
- Button createXSDImports = new Button(parent, SWT.CHECK);
- createXSDImports.setText(CXFUIMessages.JAVA2WS_GEN_XSD_IMPORTS);
- createXSDImports.setToolTipText(CXFUIMessages.JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP);
- createXSDImports.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateXSDImports(((Button) e.widget).getSelection());
- }
- });
- createXSDImports.setSelection(context.isGenerateXSDImports());
- return createXSDImports;
- }
-
- public static Label createFrontendLabel(Composite parent) {
- Label frontendLabel = new Label(parent, SWT.NONE);
- frontendLabel.setText(CXFUIMessages.CXF_DEFAULT_FRONTEND_LABEL);
- return frontendLabel;
- }
-
- public static Combo createFrontendCombo(Composite parent, final Java2WSContext context) {
- final Combo frontendCombo = new Combo(parent, SWT.READ_ONLY);
- frontendCombo.setToolTipText(CXFUIMessages.JAVA2WS_FRONTEND_TOOLTIP);
- frontendCombo.add(Frontend.JAXWS.getLiteral());
- frontendCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String frontend = frontendCombo.getText();
- context.setFrontend(Frontend.get(frontend));
- if (frontend.equals(Frontend.JAXWS.getLiteral())) {
- context.setDatabinding(DataBinding.get(DataBinding.JAXB.getLiteral()));
- }
-// if (frontend.equals("simple")) {
-// context.setDatabinding("aegis");
-// }
- }
- });
- frontendCombo.setText(context.getFrontend().getLiteral());
-
- return frontendCombo;
- }
-
- public static Label createDatabindingLabel(Composite parent) {
- Label databindingLabel = new Label(parent, SWT.NONE);
- databindingLabel.setText(CXFUIMessages.CXF_DEFAULT_DATABINDING_LABEL);
- return databindingLabel;
- }
-
- public static Combo createDatabindingCombo(Composite parent, final Java2WSContext context) {
- final Combo databindingCombo = new Combo(parent, SWT.READ_ONLY);
- databindingCombo.setToolTipText(CXFUIMessages.JAVA2WS_DATABINDING_TOOLTIP);
- databindingCombo.add(DataBinding.JAXB.getLiteral());
- databindingCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- context.setDatabinding(DataBinding.get(databindingCombo.getText()));
- }
- });
- databindingCombo.setText(context.getDatabinding().getLiteral());
- return databindingCombo;
- }
-
- public static Button createGenerateClientButton(Composite parent, final Java2WSContext context) {
- final Button genClientButton = new Button(parent, SWT.CHECK);
- genClientButton.setText(CXFUIMessages.JAVA2WS_GEN_CLIENT_LABEL);
- genClientButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_CLIENT_TOOLTIP);
- genClientButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateClient(genClientButton.getSelection());
- }
- });
- genClientButton.setSelection(context.isGenerateClient());
- return genClientButton;
- }
-
- public static Button createGenerateServerButton(Composite parent, final Java2WSContext context) {
- final Button genServerButton = new Button(parent, SWT.CHECK);
- genServerButton.setText(CXFUIMessages.JAVA2WS_GEN_SERVER_LABEL);
- genServerButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_SERVER_TOOLTIP);
- genServerButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateServer(genServerButton.getSelection());
- }
- });
- genServerButton.setSelection(context.isGenerateServer());
- return genServerButton;
- }
-
- public static Button createGenerateWrapperFaultBeanButton(Composite parent, final Java2WSContext context) {
- final Button genWrapperFaultButton = new Button(parent, SWT.CHECK);
- genWrapperFaultButton.setText(CXFUIMessages.JAVA2WS_GEN_WRAPPER_FAULT_LABEL);
- genWrapperFaultButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP);
- genWrapperFaultButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateWrapperFaultBeans(genWrapperFaultButton.getSelection());
- }
- });
- genWrapperFaultButton.setSelection(context.isGenerateWrapperFaultBeans());
- return genWrapperFaultButton;
- }
-
- public static Button createGenerateWSDLButton(Composite parent, final Java2WSContext context) {
- final Button genWSDLButton = new Button(parent, SWT.CHECK);
- genWSDLButton.setText(CXFUIMessages.JAVA2WS_GEN_WSDL_LABEL);
- genWSDLButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_WSDL_TOOLTIP);
- genWSDLButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- context.setGenerateWSDL(genWSDLButton.getSelection());
- }
- });
- genWSDLButton.setSelection(context.isGenerateWSDL());
- return genWSDLButton;
- }
-
- public static Label createWSDLFileNameLabel(Composite parent) {
- Label wsdlFileNameLabel = new Label(parent, SWT.NONE);
- wsdlFileNameLabel.setText(CXFUIMessages.JAVA2WS_WSDL_FILE_NAME);
- return wsdlFileNameLabel;
-
- }
-
- public static Text createWSDLFileNameText(Composite parent, final Java2WSDataModel model) {
- final Text wsdlFileText = new Text(parent, SWT.BORDER);
- wsdlFileText.setToolTipText(CXFUIMessages.JAVA2WS_OUTPUT_FILE_TOOLTIP);
- wsdlFileText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- model.setWsdlFileName(wsdlFileText.getText());
- }
- });
- wsdlFileText.setText(model.getWsdlFileName());
- return wsdlFileText;
- }
-
- public static Button createUseSEIButton(Composite parent) {
- Button useSEIButton = new Button(parent, SWT.CHECK);
- useSEIButton.setText(CXFUIMessages.JAVA2WS_USE_SEI_BUTTON);
- return useSEIButton;
- }
-
- public static Label createInformationLabel(Composite parent, IType startingPointType) {
- Label infoLabel = new Label(parent, SWT.WRAP);
- infoLabel.setText(CXFUIMessages.bind(CXFUIMessages.JAVA2WS_USE_SEI_INFO_LABEL, startingPointType
- .getElementName()));
- return infoLabel;
- }
-
- public static Label createPaddingLabel(Composite parent) {
- return new Label(parent, SWT.NONE);
- }
-
- public static Button createSelectSEIButton(Composite parent) {
- Button selectSEIButton = new Button(parent, SWT.RADIO);
- selectSEIButton.setText(CXFUIMessages.JAVA2WS_SELECT_SEI_LABEL);
- return selectSEIButton;
- }
-
- public static Label createSelectSEILabel(Composite parent) {
- Label selectSEILabel = new Label(parent, SWT.NONE);
- selectSEILabel.setText(CXFUIMessages.JAVA2WS_SELECT_SEI_LABEL);
- return selectSEILabel;
- }
-
- public static Combo createSelectSEICombo(Composite parent, final Java2WSDataModel model,
- IType javaStartingPointType) {
- final Combo seiCombo = new Combo(parent, SWT.READ_ONLY);
- seiCombo.setToolTipText(CXFUIMessages.JAVA2WS_SELECT_SEI_TOOLTIP);
-
- IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
- try {
- ITypeHierarchy typeHierarchy = javaStartingPointType.newTypeHierarchy(javaProject, null);
- IType[] allInterfaces = typeHierarchy.getAllInterfaces();
- for (int i = 0; i < allInterfaces.length; i++) {
- IType itype = allInterfaces[i];
- if (!itype.isBinary() && itype.getResource().getProject().equals(javaProject.getProject())) {
- seiCombo.add(itype.getFullyQualifiedName());
- }
- }
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
-
- seiCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- String seiInterfaceName = seiCombo.getText();
- model.setFullyQualifiedJavaInterfaceName(seiInterfaceName);
- }
- });
-
- seiCombo.select(-1);
- return seiCombo;
- }
-
- public static Button createExtractSEIButton(Composite parent) {
- Button extractSEIButton = new Button(parent, SWT.RADIO);
- extractSEIButton.setText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_LABEL);
- return extractSEIButton;
- }
-
- public static Label createExtractSEILabel(Composite parent) {
- Label extractSEILabel = new Label(parent, SWT.NONE);
- extractSEILabel.setText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_LABEL);
- return extractSEILabel;
- }
-
- public static Text createSEIInterfaceNameText(Composite parent) {
- Text seiInterfaceNameText = new Text(parent, SWT.BORDER);
- seiInterfaceNameText.setToolTipText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_TOOLTIP);
- return seiInterfaceNameText;
- }
-
- public static Label createMemebersToExtractLabel(Composite parent) {
- Label seiMembersToExtractLabel = new Label(parent, SWT.NONE);
- seiMembersToExtractLabel.setText(CXFUIMessages.JAVA2WS_EXTRACT_MEMBERS_LABEL);
- return seiMembersToExtractLabel;
- }
-
- public static CheckboxTableViewer createSEIMembersToExtractTableViewer(Composite parent) {
- CheckboxTableViewer seiMembersToExtractTableViewer = CheckboxTableViewer.newCheckList(parent,
- SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- seiMembersToExtractTableViewer.setLabelProvider(new JavaElementLabelProvider());
- seiMembersToExtractTableViewer.setContentProvider(new ArrayContentProvider());
- return seiMembersToExtractTableViewer;
- }
-
- public static Button createSelectAllButton(Composite parent) {
- Button selectAllButton = new Button(parent, SWT.PUSH);
- selectAllButton.setText(CXFUIMessages.JAVA2WS_SELECT_ALL_BUTTON);
- return selectAllButton;
- }
-
- public static Button createDeselectAllButton(Composite parent) {
- Button deselectAllButton = new Button(parent, SWT.PUSH);
- deselectAllButton.setText(CXFUIMessages.JAVA2WS_DESELECT_ALL_BUTTON);
- return deselectAllButton;
- }
-
- public static Label createSelectImplementationLabel(Composite parent) {
- Label selectImplementationLabel = new Label(parent, SWT.NONE);
- selectImplementationLabel.setText(CXFUIMessages.JAVA2WS_SELECT_IMPLEMENTATION);
- return selectImplementationLabel;
- }
-
- public static Combo createSelectImplementationCombo(Composite parent,
- final Java2WSDataModel model, IType javaStartingPointType) {
- final Combo selectImplementationCombo = new Combo(parent, SWT.READ_ONLY);
- selectImplementationCombo.setToolTipText(CXFUIMessages.JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP);
-
- IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
- try {
- ITypeHierarchy typeHierarchy = javaStartingPointType.newTypeHierarchy(javaProject, null);
- IType[] allImplementations = typeHierarchy.getAllSubtypes(javaStartingPointType);
- for (int i = 0; i < allImplementations.length; i++) {
- IType itype = allImplementations[i];
- if (!itype.isBinary() && itype.getResource().getProject().equals(javaProject.getProject())) {
- String packageName = itype.getPackageFragment().getElementName();
- if (packageName.trim().length() > 0) {
- packageName += "."; //$NON-NLS-1$
- }
- String qualifiedName = packageName + itype.getPrimaryElement().getElementName();
- selectImplementationCombo.add(qualifiedName);
- }
- }
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
-
- selectImplementationCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- String implementationName = selectImplementationCombo.getText();
- model.setFullyQualifiedJavaClassName(implementationName);
- }
- });
-
- selectImplementationCombo.select(-1);
- return selectImplementationCombo;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java
deleted file mode 100644
index 2b7e9f8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-/**
- * @author sclarke
- */
-public class SpringConfigComposite extends Composite {
- private CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Button useCXFServletButton;
- private Button useSpringAppContextButton;
-
- public SpringConfigComposite(Composite parent, int style) {
- super(parent, style);
- addControls();
- }
-
- private void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group springConfigGroup = new Group(this, SWT.SHADOW_IN);
- springConfigGroup.setText(CXFUIMessages.SPRING_CONFIG_GROUP_LABEL);
- GridLayout springConfigLayout = new GridLayout(2, true);
- springConfigGroup.setLayout(springConfigLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- springConfigGroup.setLayoutData(gridData);
-
- useCXFServletButton = new Button(springConfigGroup, SWT.RADIO);
- useCXFServletButton.setText(CXFUIMessages.SPRING_CONFIG_USE_CXF_SERVLET);
- useCXFServletButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setUseSpringApplicationContext(!selected);
- }
- });
-
- useSpringAppContextButton = new Button(springConfigGroup, SWT.RADIO);
- useSpringAppContextButton
- .setText(CXFUIMessages.SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT);
- useSpringAppContextButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setUseSpringApplicationContext(selected);
- }
- });
-
- if (context.isUseSpringApplicationContext()) {
- useSpringAppContextButton.setSelection(true);
- } else {
- useCXFServletButton.setSelection(true);
- }
- }
-
- public void setDefaults() {
- boolean useSpringAppcontext = CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT);
- useSpringAppContextButton.setSelection(useSpringAppcontext);
- useCXFServletButton.setSelection(!useSpringAppcontext);
- }
-
- public void storeValues() {
- context.setUseSpringApplicationContext(useSpringAppContextButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
deleted file mode 100644
index 69c07bd..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.dialogs.ResourceSelectionDialog;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameColumnLabelProvider;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * Provides widgets for WSDL2Java preferences, wizards, dialogs. Enables the
- * reuse of widgets in multiple locations. Widgets have there labeling and
- * tooltips set here and where possible listeners are set which update instances
- * of <code>WSDL2JavaContext</code> and <code>WSDL2JavaDataModel</code>.
- *
- * @author sclarke
- */
-public final class WSDL2JavaWidgetFactory {
- private static final String XJC_DV_ARG = "-Xdv"; //$NON-NLS-1$
- private static final String XJC_TS_ARG = "-Xts"; //$NON-NLS-1$
- private static final String XJC_TS_MULTI_ARG = "-Xts:style:multiline"; //$NON-NLS-1$
- private static final String XJC_TS_SIMPLE = "-Xts:style:simple"; //$NON-NLS-1$
- private static final String XJC_LOCATOR_ARG = "-Xlocator"; //$NON-NLS-1$
- private static final String XJC_SYNC_METHODS_ARG = "-Xsync-methods"; //$NON-NLS-1$
- private static final String XJC_MARK_GENERATED_ARG = "-mark-generated"; //$NON-NLS-1$
- private static final String XJC_EPISODE_FILE_ARG = "-episode"; //$NON-NLS-1$
-
- private WSDL2JavaWidgetFactory() {
- }
-
- public static Button createGenerateClientButton(Composite parent, final WSDL2JavaContext model) {
- final Button genClientButton = new Button(parent, SWT.CHECK);
- genClientButton.setText(CXFUIMessages.JAVA2WS_GEN_CLIENT_LABEL);
- genClientButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_CLIENT_TOOLTIP);
- genClientButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setGenerateClient(genClientButton.getSelection());
- }
- });
- genClientButton.setSelection(model.isGenerateClient());
- return genClientButton;
- }
-
- public static Button createGenerateServerButton(Composite parent, final WSDL2JavaContext model) {
- final Button genServerButton = new Button(parent, SWT.CHECK);
- genServerButton.setText(CXFUIMessages.JAVA2WS_GEN_SERVER_LABEL);
- genServerButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_SERVER_TOOLTIP);
- genServerButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setGenerateServer(genServerButton.getSelection());
- }
- });
- genServerButton.setSelection(model.isGenerateServer());
- return genServerButton;
- }
-
- public static Button createGenerateImplementationButton(Composite parent, final WSDL2JavaContext model) {
- final Button genImplementatinButton = new Button(parent, SWT.CHECK);
- genImplementatinButton.setText(CXFUIMessages.JAVA2WS_GEN_IMPLEMENTATION_LABEL);
- genImplementatinButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP);
- genImplementatinButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setGenerateImplementation(genImplementatinButton.getSelection());
- }
- });
- genImplementatinButton.setSelection(model.isGenerateImplementation());
- return genImplementatinButton;
- }
-
- public static Button createProcessSOAPHeadersButton(Composite parent, final WSDL2JavaContext model) {
- final Button processSOAPHeadersButton = new Button(parent, SWT.CHECK);
- processSOAPHeadersButton.setText(CXFUIMessages.WSDL2JAVA_PROCESS_SOAP_HEADERS);
- processSOAPHeadersButton.setToolTipText(CXFUIMessages.WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP);
- processSOAPHeadersButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
- }
- });
- processSOAPHeadersButton.setSelection(model.isProcessSOAPHeaders());
- return processSOAPHeadersButton;
- }
-
- public static Button createNamespacePackageMappingButton(Composite parent, final WSDL2JavaContext model) {
- final Button namespacePackageMappingButton = new Button(parent, SWT.CHECK);
- namespacePackageMappingButton
- .setText(CXFUIMessages.WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING);
- namespacePackageMappingButton
- .setToolTipText(CXFUIMessages.WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP);
- namespacePackageMappingButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
- }
- });
- namespacePackageMappingButton.setSelection(model.isLoadDefaultNamespacePackageNameMapping());
- return namespacePackageMappingButton;
- }
-
- public static Button createExcludesNamespaceMappingButton(Composite parent, final WSDL2JavaContext model) {
- final Button excludesNamespaceMappingButton = new Button(parent, SWT.CHECK);
- excludesNamespaceMappingButton
- .setText(CXFUIMessages.WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING);
- excludesNamespaceMappingButton
- .setToolTipText(CXFUIMessages.WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP);
- excludesNamespaceMappingButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
- }
- });
- excludesNamespaceMappingButton.setSelection(model.isLoadDefaultExcludesNamepsaceMapping());
- return excludesNamespaceMappingButton;
- }
-
- public static Button createNoAddressBindingButton(Composite parent, final WSDL2JavaContext model) {
- final Button noAddressBindingButton = new Button(parent, SWT.CHECK);
- noAddressBindingButton.setText(CXFUIMessages.bind(CXFUIMessages.WSDL2JAVA_NO_ADDRESS_BINDING,
- model.getCxfRuntimeEdition()));
- noAddressBindingButton.setToolTipText(
- CXFUIMessages.bind(CXFUIMessages.WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP,
- model.getCxfRuntimeEdition()));
- noAddressBindingButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setNoAddressBinding(noAddressBindingButton.getSelection());
- }
- });
- noAddressBindingButton.setSelection(model.isNoAddressBinding());
- return noAddressBindingButton;
- }
-
- public static Button createAutoNameResolutionButton(Composite parent, final WSDL2JavaContext model) {
- final Button autoNameResolutionButton = new Button(parent, SWT.CHECK);
- autoNameResolutionButton.setText(CXFUIMessages.WSDL2JAVA_AUTO_NAME_RESOLUTION);
- autoNameResolutionButton.setToolTipText(CXFUIMessages.WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP);
- autoNameResolutionButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setAutoNameResolution(autoNameResolutionButton.getSelection());
- }
- });
- autoNameResolutionButton.setSelection(model.isAutoNameResolution());
- return autoNameResolutionButton;
- }
-
- public static TableItem createXJCDefaultValuesTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcDefaultValuesItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcDefaultValuesItem.setText(0, XJC_DV_ARG);
- xjcDefaultValuesItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_DEFAULT_VALUES);
- xjcDefaultValuesItem.setChecked(model.isXjcUseDefaultValues());
- return xjcDefaultValuesItem;
- }
-
- public static TableItem createXJCToStringTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcToStringItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcToStringItem.setText(0, XJC_TS_ARG);
- xjcToStringItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING);
- xjcToStringItem.setChecked(model.isXjcToString());
- return xjcToStringItem;
- }
-
- public static TableItem createXJCToStringMultiLineTableItem(Table xjcArgsTable,
- final WSDL2JavaContext model) {
- TableItem xjcToStringMultiLineItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcToStringMultiLineItem.setText(0, XJC_TS_MULTI_ARG);
- xjcToStringMultiLineItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING_MULTILINE);
- xjcToStringMultiLineItem.setChecked(model.isXjcToStringMultiLine());
- return xjcToStringMultiLineItem;
- }
-
- public static TableItem createXJCToStringSimpleTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcToStringSimpleItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcToStringSimpleItem.setText(0, XJC_TS_SIMPLE);
- xjcToStringSimpleItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING_SIMPLE);
- xjcToStringSimpleItem.setChecked(model.isXjcToStringSimple());
- return xjcToStringSimpleItem;
- }
-
- public static TableItem createXJCLocatorTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcLocatorItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcLocatorItem.setText(0, XJC_LOCATOR_ARG);
- xjcLocatorItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_LOCATOR);
- xjcLocatorItem.setChecked(model.isXjcLocator());
- return xjcLocatorItem;
- }
-
- public static TableItem createXJCSyncMethodsTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcSyncMethodsItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcSyncMethodsItem.setText(0, XJC_SYNC_METHODS_ARG);
- xjcSyncMethodsItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_SYNC_METHODS);
- xjcSyncMethodsItem.setChecked(model.isXjcSyncMethods());
- return xjcSyncMethodsItem;
- }
-
- public static TableItem createXJCMarkGeneratedTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcMarkGeneratedItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcMarkGeneratedItem.setText(0, XJC_MARK_GENERATED_ARG);
- xjcMarkGeneratedItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_MARK_GENERATED);
- xjcMarkGeneratedItem.setChecked(model.isXjcMarkGenerated());
- return xjcMarkGeneratedItem;
- }
-
- public static TableItem createXJCEpisodeFileTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
- TableItem xjcEpisodeFileItem = new TableItem(xjcArgsTable, SWT.NONE);
- xjcEpisodeFileItem.setText(0, XJC_EPISODE_FILE_ARG);
- xjcEpisodeFileItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_EPISODE_FILE);
- return xjcEpisodeFileItem;
- }
-
- public static Table createXJCArgTable(Composite parent, final WSDL2JavaContext model) {
- Table xjcArgsTable = new Table(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION);
- xjcArgsTable.setToolTipText(CXFUIMessages.WSDL2JAVA_XJC_ARGS_TOOLTIP);
- xjcArgsTable.setLinesVisible(true);
- xjcArgsTable.setHeaderVisible(true);
-
- TableLayout tableLayout = new TableLayout();
- xjcArgsTable.setLayout(tableLayout);
-
- TableColumn xjcArgColumn = new TableColumn(xjcArgsTable, SWT.NONE);
- xjcArgColumn.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_COLUMN_NAME);
-
- ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- TableColumn descriptionColumn = new TableColumn(xjcArgsTable, SWT.NONE);
- descriptionColumn.setText(CXFUIMessages.WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME);
- columnWeightData = new ColumnWeightData(200, 200, true);
- tableLayout.addColumnData(columnWeightData);
-
- xjcArgsTable.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- if (event.detail == SWT.CHECK) {
- TableItem tableItem = (TableItem) event.item;
- String xjcArg = tableItem.getText(0);
- boolean checked = tableItem.getChecked();
- if (xjcArg.equals(XJC_DV_ARG)) {
- model.setXjcUseDefaultValues(checked);
- }
-
- if (xjcArg.equals(XJC_TS_ARG)) {
- model.setXjcToString(checked);
- }
-
- if (xjcArg.equals(XJC_TS_MULTI_ARG)) {
- model.setXjcToStringMultiLine(checked);
- }
-
- if (xjcArg.equals(XJC_TS_SIMPLE)) {
- model.setXjcToStringSimple(checked);
- }
-
- if (xjcArg.equals(XJC_LOCATOR_ARG)) {
- model.setXjcLocator(checked);
- }
-
- if (xjcArg.equals(XJC_SYNC_METHODS_ARG)) {
- model.setXjcSyncMethods(checked);
- }
-
- if (xjcArg.equals(XJC_MARK_GENERATED_ARG)) {
- model.setXjcMarkGenerated(checked);
- }
- }
- }
-
- });
-
- xjcArgColumn.pack();
- descriptionColumn.pack();
-
- return xjcArgsTable;
- }
-
- public static Label createFrontendLabel(Composite parent) {
- Label frontendLabel = new Label(parent, SWT.NONE);
- frontendLabel.setText(CXFUIMessages.CXF_DEFAULT_FRONTEND_LABEL);
- return frontendLabel;
- }
-
- public static Combo createFrontendCombo(Composite parent, final WSDL2JavaContext model) {
- final Combo frontendCombo = new Combo(parent, SWT.READ_ONLY);
- frontendCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_FRONTEND_TOOLTIP);
- frontendCombo.add(model.getFrontend().getLiteral());
- frontendCombo.setEnabled(false);
- frontendCombo.select(0);
- return frontendCombo;
- }
-
- public static Label createDatabindingLabel(Composite parent) {
- Label databindingLabel = new Label(parent, SWT.NONE);
- databindingLabel.setText(CXFUIMessages.CXF_DEFAULT_DATABINDING_LABEL);
- return databindingLabel;
- }
-
- public static Combo createDatabindingCombo(Composite parent, final WSDL2JavaContext model) {
- final Combo databindingCombo = new Combo(parent, SWT.READ_ONLY);
- databindingCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_DATABINDING_TOOLTIP);
- databindingCombo.add(model.getDatabinding().getLiteral());
- databindingCombo.setEnabled(false);
- databindingCombo.select(0);
- return databindingCombo;
- }
-
- public static Label createWSDLVersionLabel(Composite parent) {
- Label wsdlVersionLabel = new Label(parent, SWT.NONE);
- wsdlVersionLabel.setText(CXFUIMessages.WSDL2JAVA_WSDL_VERSION_LABEL);
- return wsdlVersionLabel;
- }
-
- public static Combo createWSDLVersionCombo(Composite parent, final WSDL2JavaContext model) {
- final Combo wsdlVersionCombo = new Combo(parent, SWT.READ_ONLY);
- wsdlVersionCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_WSDL_VERSION_TOOLTIP);
- wsdlVersionCombo.add(model.getWsdlVersion());
- wsdlVersionCombo.setEnabled(false);
- wsdlVersionCombo.select(0);
- return wsdlVersionCombo;
- }
-
- public static Button createDefaultValuesButton(Composite parent, final WSDL2JavaContext model) {
- final Button useDefaultValuesButton = new Button(parent, SWT.CHECK);
- useDefaultValuesButton.setText(CXFUIMessages.WSDL2JAVA_USE_DEFAULT_VALUES);
- useDefaultValuesButton.setToolTipText(CXFUIMessages.WSDL2JAVA_DEFAULT_VALUES_TOOLTIP);
- useDefaultValuesButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setUseDefaultValues(useDefaultValuesButton.getSelection());
- }
- });
- useDefaultValuesButton.setSelection(model.isUseDefaultValues());
- return useDefaultValuesButton;
- }
-
- public static Label createOutputDirectoryLabel(Composite parent) {
- Label srcDirLabel = new Label(parent, SWT.NONE);
- srcDirLabel.setText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY);
- srcDirLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP);
- return srcDirLabel;
- }
-
- public static Combo createOutputDirectoryCombo(Composite parent, final WSDL2JavaDataModel model) {
- final Combo outputDirCombo = new Combo(parent, SWT.READ_ONLY);
- outputDirCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP);
- outputDirCombo.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- String javaSourceFolder = outputDirCombo.getText();
- model.setJavaSourceFolder(javaSourceFolder);
- }
- });
-
- populateOutputDirectoryCombo(outputDirCombo, model.getProjectName());
-
- return outputDirCombo;
- }
-
- public static void populateOutputDirectoryCombo(Combo outputDirCombo, String projectName) {
- outputDirCombo.removeAll();
- try {
- IPackageFragmentRoot[] packageFragmentRoots = JDTUtils.getJavaProject(projectName)
- .getAllPackageFragmentRoots();
- for (int i = 0; i < packageFragmentRoots.length; i++) {
- IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[i];
- if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
- outputDirCombo.add(packageFragmentRoot.getResource().getFullPath().toOSString());
- }
- }
- outputDirCombo.select(0);
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
- }
-
- public static Label createPackageNameLabel(Composite parent) {
- Label packageNameLabel = new Label(parent, SWT.NONE);
- packageNameLabel.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME);
- packageNameLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_TOOLTIP);
- return packageNameLabel;
- }
-
- public static Text createPackageNameText(Composite parent, final WSDL2JavaDataModel model) {
- final Text packageNameText = new Text(parent, SWT.BORDER);
- packageNameText.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_TOOLTIP);
-
- packageNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String packageName = packageNameText.getText();
- model.getIncludedNamespaces().put(model.getTargetNamespace(), packageName);
- }
- });
-
- packageNameText.setText(model.getIncludedNamespaces().get(model.getTargetNamespace()));
-
- return packageNameText;
- }
-
- public static Button createNamespacePackageMappingButton(Composite parent) {
- final Button namespaceMappingButton = new Button(parent, SWT.CHECK);
- namespaceMappingButton.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_OPTIONAL);
- namespaceMappingButton.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP);
- return namespaceMappingButton;
- }
-
- public static TableViewerColumn createWSDLNamespaceViewerColumn(TableViewer tableViewer) {
- TableViewerColumn wsdlNamespaceViewerColumn = new TableViewerColumn(tableViewer, SWT.LEFT);
- wsdlNamespaceViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- return element.toString();
- }
- });
- TableColumn wsdlNamespaceColumn = wsdlNamespaceViewerColumn.getColumn();
- wsdlNamespaceColumn.setText(CXFUIMessages.WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER);
- wsdlNamespaceColumn.pack();
- return wsdlNamespaceViewerColumn;
- }
-
- public static TableViewerColumn createPackageNameColumn(TableViewer tableViewer, WSDL2JavaDataModel model) {
- TableViewerColumn packageNameViewerColumn = new TableViewerColumn(tableViewer, SWT.LEFT);
- packageNameViewerColumn.setLabelProvider(new PackageNameColumnLabelProvider(model));
-
- TableColumn packageNameColumn = packageNameViewerColumn.getColumn();
- packageNameColumn.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER);
- packageNameColumn.pack();
- return packageNameViewerColumn;
- }
-
- public static Label createServiceNameLabel(Composite parent) {
- Label serviceNameLabel = new Label(parent, SWT.NONE);
- serviceNameLabel.setText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME);
- serviceNameLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME_TOOLTIP);
- return serviceNameLabel;
- }
-
- public static Combo createServiceNameCombo(Composite parent, final WSDL2JavaDataModel model) {
- final Combo serviceNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- serviceNameCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME_TOOLTIP);
-
- serviceNameCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- model.setServiceName(serviceNameCombo.getText());
- }
- });
-
- populateServiceNameCombo(serviceNameCombo, model);
-
- return serviceNameCombo;
- }
-
- @SuppressWarnings("unchecked")
- public static void populateServiceNameCombo(Combo serviceNameCombo, WSDL2JavaDataModel model) {
- serviceNameCombo.removeAll();
- Definition definition = model.getWsdlDefinition();
- if (definition != null) {
- Map servicesMap = definition.getServices();
- if (servicesMap != null) {
- Set servicesEntrySet = servicesMap.entrySet();
- Iterator servicesIterator = servicesEntrySet.iterator();
- while (servicesIterator.hasNext()) {
- Map.Entry serviceEntry = (Map.Entry) servicesIterator.next();
- Service service = (Service) serviceEntry.getValue();
- QName qName = service.getQName();
- serviceNameCombo.add(qName.getLocalPart());
- }
- serviceNameCombo.select(-1);
- }
- }
- }
-
- public static Label createBindingFilesLabel(Composite parent) {
- Label bindingFilesLabel = new Label(parent, SWT.NONE);
- bindingFilesLabel.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES);
- bindingFilesLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_BINDING_NAME_TOOLTIP);
- return bindingFilesLabel;
- }
-
- public static List createBindingFilesList(Composite parent) {
- final List bindingFilesList = new List(parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- bindingFilesList.setToolTipText(CXFUIMessages.WSDL2JAVA_BINDING_NAME_TOOLTIP);
- return bindingFilesList;
- }
-
- public static Button createAddBindingFileButton(final Composite parent, final WSDL2JavaDataModel model,
- final List bindingFilesList) {
- Button addBindingFileButton = new Button(parent, SWT.PUSH);
- addBindingFileButton.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES_ADD);
- addBindingFileButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- ResourceSelectionDialog selectionDialog = new ResourceSelectionDialog(
- parent.getShell(),
- "xml", //$NON-NLS-1$
- CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME,
- CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_TITLE);
- selectionDialog.setMessage(CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE);
- if (selectionDialog.open() == SelectionDialog.OK) {
- String result = selectionDialog.getResult()[0].toString();
- if (!model.getBindingFiles().contains(result)) {
- model.getBindingFiles().add(result);
- bindingFilesList.add(result);
- }
- }
- }
- });
- return addBindingFileButton;
- }
-
- public static Button createRemoveBindingFileButton(Composite parent, final WSDL2JavaDataModel model,
- final List bindingFilesList) {
- final Button removeBindingFileButton = new Button(parent, SWT.PUSH);
- removeBindingFileButton.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES_REMOVE);
- removeBindingFileButton.setEnabled(false);
- removeBindingFileButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- String[] selectedBindingFiles = bindingFilesList.getSelection();
- for (String bindingFile : selectedBindingFiles) {
- bindingFilesList.remove(bindingFile);
- model.getBindingFiles().remove(bindingFile);
- }
-
- if (bindingFilesList.getItemCount() == 0) {
- removeBindingFileButton.setEnabled(false);
- }
- }
- });
-
- bindingFilesList.addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent event) {
- if (bindingFilesList.getItemCount() == 0) {
- removeBindingFileButton.setEnabled(false);
- } else {
- removeBindingFileButton.setEnabled(true);
- }
- }
- });
-
- return removeBindingFileButton;
- }
-
- public static Label createPaddingLabel(Composite parent) {
- return new Label(parent, SWT.NONE);
- }
-
- public static Label createXMLCatalogLabel(Composite parent) {
- Label xmlCatalogLabel = new Label(parent, SWT.NONE);
- xmlCatalogLabel.setText(CXFUIMessages.WSDL2JAVA_XML_CATLOG);
- xmlCatalogLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_XML_CATALOG_TOOLTIP);
- return xmlCatalogLabel;
- }
-
- public static Text createXMLCatalogText(Composite parent, final WSDL2JavaDataModel model) {
- final Text xmlCatalogText = new Text(parent, SWT.BORDER);
- xmlCatalogText.setToolTipText(CXFUIMessages.WSDL2JAVA_XML_CATALOG_TOOLTIP);
- xmlCatalogText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String xmlCatalog = xmlCatalogText.getText();
- model.setCatalogFile(xmlCatalog);
- }
- });
-
- return xmlCatalogText;
- }
-
- public static Button createXMLCatalogBrowseButton(Composite parent) {
- Button xmlCatalogBrowseButton = new Button(parent, SWT.PUSH);
- xmlCatalogBrowseButton.setText(CXFUIMessages.WSDL2JAVA_XML_CATLOG_BROWSE);
- return xmlCatalogBrowseButton;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.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);
- }
- }
-}